diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 18:55:15 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 18:55:15 +0000 |
| commit | edf2153505319f011e6d231c61b7255ce5f65ce4 (patch) | |
| tree | 1200beac672f81a2f5aeecba6f789daca735e9a4 /ash/accelerators | |
| parent | fc1beed3c1f06b5381f2ae8acf788b5f2f33fbfd (diff) | |
| download | chromium_src-edf2153505319f011e6d231c61b7255ce5f65ce4.zip chromium_src-edf2153505319f011e6d231c61b7255ce5f65ce4.tar.gz chromium_src-edf2153505319f011e6d231c61b7255ce5f65ce4.tar.bz2 | |
Revert 118698 - Bug=105964
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=118540
Review URL: https://chromiumcodereview.appspot.com/9124021
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9270051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 13 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 943d296..8a736d3 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -9,7 +9,6 @@ #include "ash/launcher/launcher_model.h" #include "ash/screenshot_delegate.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/wm/window_cycle_controller.h" #include "ui/aura/event.h" @@ -26,7 +25,6 @@ namespace { enum AcceleratorAction { CYCLE_BACKWARD, CYCLE_FORWARD, - EXIT, TAKE_SCREENSHOT, TOGGLE_CAPS_LOCK, #if !defined(NDEBUG) @@ -47,7 +45,6 @@ struct AcceleratorData { { ui::VKEY_TAB, false, false, true, CYCLE_FORWARD }, { ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD }, { ui::VKEY_F5, false, false, false, CYCLE_FORWARD }, - { ui::VKEY_Q, true, true, false, EXIT }, { ui::VKEY_F5, true, false, false, CYCLE_BACKWARD }, { ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT }, { ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT }, @@ -71,14 +68,6 @@ bool HandleCycleWindow(ash::WindowCycleController::Direction direction, return true; } -bool HandleExit() { - ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate(); - if (!delegate) - return false; - delegate->Exit(); - return true; -} - #if !defined(NDEBUG) // Rotates the screen. bool HandleRotateScreen() { @@ -197,8 +186,6 @@ bool AcceleratorController::AcceleratorPressed( case CYCLE_FORWARD: return HandleCycleWindow(WindowCycleController::FORWARD, accelerator.IsAltDown()); - case EXIT: - return HandleExit(); case TAKE_SCREENSHOT: if (screenshot_delegate_.get()) screenshot_delegate_->HandleTakeScreenshot(); diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index a9cce71..1de432f 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -319,10 +319,6 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_F11, false, true, false))); #endif - - // Exit - EXPECT_TRUE(GetController()->Process( - ui::Accelerator(ui::VKEY_Q, true, true ,false))); #endif } |