Moves accelerator registration to WindowManager

mash/wm/root_window_controller.cc

 // 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.
 
 #include "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
@@ skipping 69 matching lines @@
 }
 
 mus::Window* RootWindowController::GetWindowById(mus::Id id) {
   return root_->GetChildById(id);
 }
 
 bool RootWindowController::WindowIsContainer(const mus::Window* window) const {
   return window && window->parent() == root_;
 }
 
+void RootWindowController::OnAccelerator(uint32_t id,
+                                         mus::mojom::EventPtr event) {
+  switch (id) {
+    case kWindowSwitchAccelerator:
+      window_tree_host_->ActivateNextWindow();
+      break;
+    default:
+      app_->OnAccelerator(id, std::move(event));
+      break;
+  }
+}
+
 RootWindowController::RootWindowController(WindowManagerApplication* app)
     : app_(app), root_(nullptr), window_count_(0), host_client_binding_(this) {
   window_manager_.reset(new WindowManager);
 }
 
 RootWindowController::~RootWindowController() {}
 
 void RootWindowController::AddAccelerators() {
-  window_tree_host_->AddAccelerator(
+  window_manager_->window_manager_client()->AddAccelerator(
       kWindowSwitchAccelerator,
       mus::CreateKeyMatcher(mus::mojom::KeyboardCode::TAB,
                             mus::mojom::kEventFlagControlDown),
       base::Bind(&AssertTrue));
 }
 
-void RootWindowController::OnAccelerator(uint32_t id,
-                                         mus::mojom::EventPtr event) {
-  switch (id) {
-    case kWindowSwitchAccelerator:
-      window_tree_host_->ActivateNextWindow();
-      break;
-    default:
-      app_->OnAccelerator(id, std::move(event));
-      break;
-  }
-}
-
 void RootWindowController::OnEmbed(mus::Window* root) {
   root_ = root;
   root_->AddObserver(this);
 
   app_->OnRootWindowControllerGotRoot(this);
 
   CreateContainers();
   background_layout_.reset(new BackgroundLayout(
       GetWindowForContainer(mojom::Container::USER_BACKGROUND)));
   screenlock_layout_.reset(new ScreenlockLayout(
@@ skipping 41 matching lines @@
     DCHECK_EQ(mus::LoWord(window->id()), container)
         << "Containers must be created before other windows!";
     window->SetBounds(root_->bounds());
     window->SetVisible(true);
     root_->AddChild(window);
   }
 }
 
 }  // namespace wm
 }  // namespace mash