Unify and change logout/sleep/lock shortcuts

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 43e2dac547950e5c85a02a14175b7ff9758854af..175c79dedca5ea1b585484eba0333c5aec685afe 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -368,7 +368,8 @@ void AcceleratorControllerContext::UpdateContext(
 // AcceleratorController, public:
 
 AcceleratorController::AcceleratorController()
-    : accelerator_manager_(new ui::AcceleratorManager) {
+    : accelerator_manager_(new ui::AcceleratorManager),
+      exit_warning_handler_(&context_) {
   Init();
 }
 
@@ -577,9 +578,8 @@ bool AcceleratorController::PerformAction(int action,
     case OPEN_FEEDBACK_PAGE:
       ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();
       return true;
-    case EXIT_PRESSED:
-    case EXIT_RELEASED:
-      exit_warning_handler_.HandleExitKey(action == EXIT_PRESSED);
+    case EXIT:
+      exit_warning_handler_.HandleAccelerator();
       return true;
     case NEW_INCOGNITO_WINDOW:
       Shell::GetInstance()->delegate()->NewWindow(true /* is_incognito */);