Unify and change logout/sleep/lock shortcuts

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
 
 #include "ash/accelerators/accelerator_table.h"
+#include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/debug.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/launcher/launcher.h"
@@ skipping 338 matching lines @@
 void AcceleratorControllerContext::UpdateContext(
     const ui::Accelerator& accelerator) {
   previous_accelerator_ = current_accelerator_;
   current_accelerator_ = accelerator;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
 
 AcceleratorController::AcceleratorController()
-    : accelerator_manager_(new ui::AcceleratorManager) {
+    : accelerator_manager_(new ui::AcceleratorManager),
+      exit_warning_handler_(new ExitWarningHandler) {

[sky, 2013/05/13 15:40:32]

If the lifetime of ExitWarningHandler is that of AcceleratorController then
there is no point in scoped_ptr.

[sschmitz, 2013/05/14 16:49:11]

Done.

   Init();
 }
 
 AcceleratorController::~AcceleratorController() {
 }
 
 void AcceleratorController::Init() {
   for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) {
     actions_allowed_at_login_screen_.insert(
         kActionsAllowedAtLoginOrLockScreen[i]);
@@ skipping 185 matching lines @@
       }
       return false;
     }
     case DISABLE_GPU_WATCHDOG:
       content::GpuDataManager::GetInstance()->DisableGpuWatchdog();
       return true;
 #endif
     case OPEN_FEEDBACK_PAGE:
       ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();
       return true;
-    case EXIT:
-      Shell::GetInstance()->delegate()->Exit();
+    case EXIT_PRESSED:
+    case EXIT_RELEASED:
+      exit_warning_handler_->HandleExitKey(action == EXIT_PRESSED);
       return true;
     case NEW_INCOGNITO_WINDOW:
       Shell::GetInstance()->delegate()->NewWindow(true /* is_incognito */);
       return true;
     case NEW_TAB:
       if (key_code == ui::VKEY_T)
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_NEWTAB_T);
       Shell::GetInstance()->delegate()->NewTab();
       return true;
     case NEW_WINDOW:
@@ skipping 372 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash