aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 54cc03271d7d..9c17eb84ffec 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2020-07-07 21:58:14 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2020-09-08 19:14:01 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -83,7 +83,7 @@
#include "components/session_manager/core/session_manager.h"
@@ -6,10 +6,10 @@
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
+ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" // nogncheck
#endif
-@@ -253,7 +253,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -254,7 +254,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -479,7 +479,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -480,7 +480,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
@@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -981,7 +981,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -953,7 +953,7 @@ void BrowserCommandController::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
#endif