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 112 matching lines @@
   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_