Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5675)

Unified Diff: chrome/browser/ui/browser_command_controller.cc

Issue 23611005: ash: Allow web pages to use the Ctrl-M minimize shortcut (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_command_controller.cc
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 27ed93c582719d479a100e8b721d1bcf63fc1a84..360c5b94b400399e6e83f60de69f856bf5efde03 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -51,6 +51,7 @@
#endif
#if defined(USE_ASH)
+#include "ash/accelerators/accelerator_commands.h"
#include "chrome/browser/ui/ash/ash_util.h"
#endif
@@ -444,6 +445,11 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
case IDC_TOGGLE_ASH_DESKTOP:
chrome::ToggleAshDesktop();
break;
+ case IDC_MINIMIZE_WINDOW:
+ ash::accelerators::ToggleMinimized();
+ break;
+ // If Ash needs many more commands here we should implement a general
+ // mechanism to pass accelerators back into Ash. http://crbug.com/285308
#endif
#if defined(OS_WIN)
@@ -835,6 +841,9 @@ void BrowserCommandController::InitCommandState() {
chrome::HOST_DESKTOP_TYPE_NATIVE != chrome::HOST_DESKTOP_TYPE_ASH)
command_updater_.UpdateCommandEnabled(IDC_TOGGLE_ASH_DESKTOP, true);
#endif
+#if defined(USE_ASH)
+ command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
+#endif
// Page-related commands
command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, true);

Powered by Google App Engine
This is Rietveld 408576698