Moves accelerator registration to WindowManager

mash/wm/root_window_controller.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 MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
@@ skipping 38 matching lines @@
 
   mus::Window* root() { return root_; }
 
   int window_count() { return window_count_; }
   void IncrementWindowCount() { ++window_count_; }
 
   mus::Window* GetWindowForContainer(mojom::Container container);
   mus::Window* GetWindowById(mus::Id id);
   bool WindowIsContainer(const mus::Window* window) const;
 
+  WindowManager* window_manager() { return window_manager_.get(); }
+
   // TODO(sky): don't expose this, it may be null.
   mus::mojom::WindowTreeHost* window_tree_host() {
     return window_tree_host_.get();
   }
 
+  void OnAccelerator(uint32_t id, mus::mojom::EventPtr event);
+
  private:
   explicit RootWindowController(WindowManagerApplication* app);
   ~RootWindowController() override;
 
   void AddAccelerators();
 
   // Sets up the window containers used for z-space management.
   void CreateContainers();
 
-  // WindowTreeHostClient:
-  void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override;
-
   // WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
   // mus::WindowObserver:
   void OnWindowDestroyed(mus::Window* window) override;
 
   WindowManagerApplication* app_;
   mus::Window* root_;
   int window_count_;
@@ skipping 12 matching lines @@
 
   mus::mojom::DisplayPtr display_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_ROOT_WINDOW_CONTROLLER_H_