diff options
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.cc | 12 |
1 files changed, 6 insertions, 6 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 59c1d4f68cf5..18d80fcd4f95 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -80,7 +80,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" @@ -9,16 +9,16 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -190,7 +190,7 @@ bool BrowserCommandController::IsReserve - if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) - return true; +@@ -209,7 +209,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( + #endif + } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -395,7 +395,7 @@ void BrowserCommandController::ExecuteCo +@@ -413,7 +413,7 @@ void BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -755,7 +755,7 @@ void BrowserCommandController::InitComma +@@ -766,7 +766,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif |