1 files changed, 0 insertions, 13 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();