Unify and change logout/sleep/lock shortcuts

ash/accelerators/accelerator_controller.h

 // 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.
 
 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 23 matching lines @@
 // or if the current accelerator is repeated or not.
 class ASH_EXPORT AcceleratorControllerContext {
  public:
   AcceleratorControllerContext();
   ~AcceleratorControllerContext() {}
 
   // Updates context - determines if the accelerator is repeated, as well as
   // event type of the previous accelerator.
   void UpdateContext(const ui::Accelerator& accelerator);
 
+  const ui::Accelerator& current_accelerator() const {
+    return current_accelerator_;
+  }
   const ui::Accelerator& previous_accelerator() const {
     return previous_accelerator_;
   }
   bool repeated() const {
     return current_accelerator_ == previous_accelerator_ &&
         current_accelerator_.type() != ui::ET_UNKNOWN;
   }
 
  private:
   ui::Accelerator current_accelerator_;
@@ skipping 80 matching lines @@
 
   void SetKeyboardBrightnessControlDelegate(
       scoped_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate);
 
   scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
 
   // TODO(derat): BrightnessControlDelegate is also used by the system tray;
   // move it outside of this class.
   scoped_ptr<BrightnessControlDelegate> brightness_control_delegate_;
-  ExitWarningHandler exit_warning_handler_;
   scoped_ptr<ImeControlDelegate> ime_control_delegate_;
   scoped_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;
   scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
 
   // Contextual information, eg. if the current accelerator is repeated.
   AcceleratorControllerContext context_;
 
+  // Handles the exit accelerator which requires a long hold to exit and
+  // shows a popup with an explanation.
+  ExitWarningHandler exit_warning_handler_;
+
   // A map from accelerators to the AcceleratorAction values, which are used in
   // the implementation.
   std::map<ui::Accelerator, int> accelerators_;
 
   // Actions allowed when the user is not signed in.
   std::set<int> actions_allowed_at_login_screen_;
   // Actions allowed when the screen is locked.
   std::set<int> actions_allowed_at_lock_screen_;
   // Actions allowed when a modal window is up.
   std::set<int> actions_allowed_at_modal_window_;
   // Reserved actions. See accelerator_table.h for details.
   std::set<int> reserved_actions_;
   // Actions which will not be repeated while holding the accelerator key.
   std::set<int> nonrepeatable_actions_;
   // Actions allowed in app mode.
   std::set<int> actions_allowed_in_app_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_