summaryrefslogtreecommitdiff
path: root/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch')
-rw-r--r--www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
index e3ce3e5..317602c 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
@@ -1,6 +1,6 @@
1--- a/chrome/browser/ui/browser_command_controller.cc 1--- chrome/browser/ui/browser_command_controller.cc.orig
2+++ b/chrome/browser/ui/browser_command_controller.cc 2+++ chrome/browser/ui/browser_command_controller.cc
3@@ -1160,7 +1160,8 @@ void BrowserCommandController::InitComma 3@@ -1139,7 +1139,8 @@ void BrowserCommandController::InitComma
4 command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, 4 command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
5 normal_window); 5 normal_window);
6 6
@@ -10,8 +10,8 @@
10 command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH, 10 command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH,
11 enable_tab_search_commands); 11 enable_tab_search_commands);
12 command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE, 12 command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
13--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc 13--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig
14+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc 14+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
15@@ -5,6 +5,7 @@ 15@@ -5,6 +5,7 @@
16 #include "chrome/browser/ui/views/frame/tab_strip_region_view.h" 16 #include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
17 17
@@ -20,19 +20,19 @@
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "chrome/browser/themes/theme_properties.h" 22 #include "chrome/browser/themes/theme_properties.h"
23@@ -137,7 +138,8 @@ TabStripRegionView::TabStripRegionView(s 23@@ -132,7 +133,8 @@ TabStripRegionView::TabStripRegionView(s
24 return; 24 return;
25 } 25 #endif
26 26 const Browser* browser = tab_strip_->controller()->GetBrowser();
27- if (browser->is_type_normal()) { 27- if (browser && browser->is_type_normal()) {
28+ if (browser->is_type_normal() && 28+ if (browser && browser->is_type_normal() &&
29+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) { 29+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
30 auto tab_search_button = std::make_unique<TabSearchButton>(tab_strip_); 30 auto tab_search_button = std::make_unique<TabSearchButton>(tab_strip_);
31 tab_search_button->SetTooltipText( 31 tab_search_button->SetTooltipText(
32 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_SEARCH)); 32 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_SEARCH));
33--- a/chrome/browser/ungoogled_flag_entries.h 33--- chrome/browser/ungoogled_flag_entries.h.orig
34+++ b/chrome/browser/ungoogled_flag_entries.h 34+++ chrome/browser/ungoogled_flag_entries.h
35@@ -64,4 +64,8 @@ 35@@ -68,4 +68,8 @@
36 "Clear data on exit", 36 "Clear data on exit",
37 "Clears all browsing data on exit. ungoogled-chromium flag", 37 "Clears all browsing data on exit. ungoogled-chromium flag",
38 kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)}, 38 kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},