summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_controller.cc
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 20:21:13 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 20:21:13 +0000
commit2b4cd30636e2e17528135b3332c3536ca2da5633 (patch)
tree476f60ff2fe41b01a0413b1120319ad4c9761080 /ash/accelerators/accelerator_controller.cc
parent76fa749a64733060e553da96ab1d2325cc02bb43 (diff)
downloadchromium_src-2b4cd30636e2e17528135b3332c3536ca2da5633.zip
chromium_src-2b4cd30636e2e17528135b3332c3536ca2da5633.tar.gz
chromium_src-2b4cd30636e2e17528135b3332c3536ca2da5633.tar.bz2
Aura: Remove dynamic switching into and out of compact mode
Going forward we'll select compact mode based on command line flags passed by the session manager. Compact mode should go away entirely when Aura is more mature, so we don't need to maintain the ability to switch modes. This patch simplifies the Shell setup code and updates the Shell unit tests to match. BUG=115314 TEST=aura_shell_unittests, specifically Shell* Review URL: http://codereview.chromium.org/9452028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
-rw-r--r--ash/accelerators/accelerator_controller.cc13
1 files changed, 0 insertions, 13 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 1a9e54a..9ee26a9 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -49,7 +49,6 @@ enum AcceleratorAction {
PRINT_LAYER_HIERARCHY,
PRINT_WINDOW_HIERARCHY,
ROTATE_SCREEN,
- TOGGLE_COMPACT_WINDOW_MODE,
TOGGLE_DESKTOP_BACKGROUND_MODE,
TOGGLE_ROOT_WINDOW_FULL_SCREEN,
#endif
@@ -123,8 +122,6 @@ const struct AcceleratorData {
#if !defined(NDEBUG)
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_HOME, false, true, false,
ROTATE_SCREEN },
- { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_A, false, true, true,
- TOGGLE_COMPACT_WINDOW_MODE },
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_B, false, true, true,
TOGGLE_DESKTOP_BACKGROUND_MODE },
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F11, false, true, false,
@@ -199,14 +196,6 @@ bool HandleRotateScreen() {
return true;
}
-bool HandleToggleCompactWindowMode() {
- if (ash::Shell::GetInstance()->IsWindowModeCompact())
- ash::Shell::GetInstance()->ChangeWindowMode(ash::Shell::MODE_OVERLAPPING);
- else
- ash::Shell::GetInstance()->ChangeWindowMode(ash::Shell::MODE_COMPACT);
- return true;
-}
-
bool HandleToggleDesktopBackgroundMode() {
ash::Shell* shell = ash::Shell::GetInstance();
if (shell->desktop_background_mode() == ash::Shell::BACKGROUND_IMAGE)
@@ -393,8 +382,6 @@ bool AcceleratorController::AcceleratorPressed(
#if !defined(NDEBUG)
case ROTATE_SCREEN:
return HandleRotateScreen();
- case TOGGLE_COMPACT_WINDOW_MODE:
- return HandleToggleCompactWindowMode();
case TOGGLE_DESKTOP_BACKGROUND_MODE:
return HandleToggleDesktopBackgroundMode();
case TOGGLE_ROOT_WINDOW_FULL_SCREEN: