Wires up registering accelerators from mash with the wm

ash/mus/bridge/wm_shell_mus.h

 // Copyright 2016 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_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/wm_shell.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "services/ui/public/cpp/window_tree_client_observer.h"
 
 namespace shell {
 class Connector;
 }
 
 namespace ui {
 class WindowTreeClient;
 }
 
 namespace ash {
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
+class AcceleratorControllerRegistrar;
+class WindowManager;
 class WmRootWindowControllerMus;
 class WmWindowMus;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
  public:
   WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
-             ::ui::WindowTreeClient* client);
+             WindowManager* window_manager);
   ~WmShellMus() override;
 
   static WmShellMus* Get();
 
   void AddRootWindowController(WmRootWindowControllerMus* controller);
   void RemoveRootWindowController(WmRootWindowControllerMus* controller);
 
   // Returns the ancestor of |window| (including |window|) that is considered
   // toplevel. |window| may be null.
   static WmWindowMus* GetToplevelAncestor(::ui::Window* window);
 
   WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
 
+  AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
+    return accelerator_controller_delegate_.get();
+  }
+
   // WmShell:
   WmWindow* NewContainerWindow() override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
   WmWindow* GetPrimaryRootWindow() override;
   WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
   WmWindow* GetRootWindowForNewWindows() override;
   const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;
   bool IsActiveDisplayId(int64_t display_id) const override;
   bool IsForceMaximizeOnFirstRun() override;
@@ skipping 21 matching lines @@
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
   void AddPointerWatcher(views::PointerWatcher* watcher) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
 #if defined(OS_CHROMEOS)
   void ToggleIgnoreExternalKeyboard() override;
 #endif
 
  private:
+  ::ui::WindowTreeClient* window_tree_client();
+
   // Returns true if |window| is a window that can have active children.
   static bool IsActivationParent(::ui::Window* window);
 
-  void RemoveClientObserver();
-
   // ::ui::WindowTreeClientObserver:
   void OnWindowTreeFocusChanged(::ui::Window* gained_focus,
                                 ::ui::Window* lost_focus) override;
   void OnDidDestroyClient(::ui::WindowTreeClient* client) override;
 
-  ::ui::WindowTreeClient* client_;
+  WindowManager* window_manager_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
   std::unique_ptr<AcceleratorControllerDelegateMus>
       accelerator_controller_delegate_;
+  std::unique_ptr<AcceleratorControllerRegistrar>
+      accelerator_controller_registrar_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_