Separates out accelerator handling in windowmanager

ash/mus/window_manager.h

 // Copyright 2015 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_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 12 matching lines @@
 class Screen;
 }
 
 namespace shell {
 class Connector;
 }
 
 namespace ash {
 namespace mus {
 
+class AcceleratorHandler;
 class RootWindowController;
 class ShadowController;
 class WindowManagerObserver;
 class WmShellMus;
 class WmLookupMus;
 class WmTestHelper;
 
 // WindowManager serves as the WindowManagerDelegate and
 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
 // a RootWindowController per Display. WindowManager takes ownership of
@@ skipping 18 matching lines @@
   shell::Connector* connector() { return connector_; }
 
   void SetScreenLocked(bool is_locked);
 
   // Creates a new top level window.
   ::ui::Window* NewTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties);
 
   std::set<RootWindowController*> GetRootWindowControllers();
 
+  // Returns the next accelerator namespace id by value in |id|. Returns true
+  // if there is another slot available, false if all slots are taken up.
+  bool GetNextAcceleratorNamespaceId(uint16_t* id);
+  void AddAcceleratorHandler(uint16_t id_namespace,
+                             AcceleratorHandler* handler);
+  void RemoveAcceleratorHandler(uint16_t id_namespace);
+
   void AddObserver(WindowManagerObserver* observer);
   void RemoveObserver(WindowManagerObserver* observer);
 
  private:
   friend class WmTestHelper;
 
-  void AddAccelerators();
-
   RootWindowController* CreateRootWindowController(
       ::ui::Window* window,
       const display::Display& display);
 
   // ::ui::WindowObserver:
   void OnWindowDestroying(::ui::Window* window) override;
   void OnWindowDestroyed(::ui::Window* window) override;
 
   // WindowTreeClientDelegate:
   void OnEmbed(::ui::Window* root) override;
@@ skipping 32 matching lines @@
   std::set<std::unique_ptr<RootWindowController>> root_window_controllers_;
 
   base::ObserverList<WindowManagerObserver> observers_;
 
   std::unique_ptr<display::Screen> screen_;
 
   std::unique_ptr<WmShellMus> shell_;
 
   std::unique_ptr<WmLookupMus> lookup_;
 
+  std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
+  uint16_t next_accelerator_namespace_id_ = 0u;
+
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_