Wires up registering accelerators from mash with the wm

ash/mus/bridge/wm_shell_mus.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 "ash/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_cycle_event_filter.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
+#include "ash/mus/accelerators/accelerator_controller_registrar.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/root_window_controller.h"
+#include "ash/mus/window_manager.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 
 namespace ash {
 namespace mus {
 
 namespace {
@@ skipping 53 matching lines @@
 
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
-                       ::ui::WindowTreeClient* client)
+                       WindowManager* window_manager)
     : WmShell(std::move(shell_delegate)),
-      client_(client),
+      window_manager_(window_manager),
       session_state_delegate_(new SessionStateDelegateStub) {
-  client_->AddObserver(this);
+  window_tree_client()->AddObserver(this);
   WmShell::Set(this);
 
+  uint16_t accelerator_namespace_id = 0u;
+  const bool add_result =
+      window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
+  // WmShellMus is created early on, so that this should always succeed.
+  DCHECK(add_result);
   accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateMus);
+  accelerator_controller_registrar_.reset(new AcceleratorControllerRegistrar(
+      window_manager_, accelerator_namespace_id));
   SetAcceleratorController(base::MakeUnique<AcceleratorController>(
-      accelerator_controller_delegate_.get()));
+      accelerator_controller_delegate_.get(),
+      accelerator_controller_registrar_.get()));
 
   CreateMaximizeModeController();
 
   CreateMruWindowTracker();
 
   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
 
   // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
   SetKeyboardUI(KeyboardUI::Create());
 }
 
 WmShellMus::~WmShellMus() {
   // This order mirrors that of Shell.
 
   // Destroy maximize mode controller early on since it has some observers which
   // need to be removed.
   DeleteMaximizeModeController();
   DeleteToastManager();
   DeleteSystemTrayDelegate();
   // Has to happen before ~MruWindowTracker.
   DeleteWindowCycleController();
   DeleteWindowSelectorController();
   DeleteMruWindowTracker();
-  RemoveClientObserver();
+  if (window_tree_client())
+    window_tree_client()->RemoveObserver(this);
   WmShell::Set(nullptr);
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 void WmShellMus::AddRootWindowController(
     WmRootWindowControllerMus* controller) {
@@ skipping 23 matching lines @@
   for (WmRootWindowControllerMus* root_window_controller :
        root_window_controllers_) {
     if (root_window_controller->GetDisplay().id() == id)
       return root_window_controller;
   }
   NOTREACHED();
   return nullptr;
 }
 
 WmWindow* WmShellMus::NewContainerWindow() {
-  return WmWindowMus::Get(client_->NewWindow());
+  return WmWindowMus::Get(window_tree_client()->NewWindow());
 }
 
 WmWindow* WmShellMus::GetFocusedWindow() {
-  return WmWindowMus::Get(client_->GetFocusedWindow());
+  return WmWindowMus::Get(window_tree_client()->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetActiveWindow() {
-  return GetToplevelAncestor(client_->GetFocusedWindow());
+  return GetToplevelAncestor(window_tree_client()->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetPrimaryRootWindow() {
   return root_window_controllers_[0]->GetWindow();
 }
 
 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
   return GetRootWindowControllerWithDisplayId(display_id)->GetWindow();
 }
 
@@ skipping 123 matching lines @@
 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
   NOTIMPLEMENTED();
 }
 
 #if defined(OS_CHROMEOS)
 void WmShellMus::ToggleIgnoreExternalKeyboard() {
   NOTIMPLEMENTED();
 }
 #endif  // defined(OS_CHROMEOS)
 
+::ui::WindowTreeClient* WmShellMus::window_tree_client() {
+  return window_manager_->window_tree_client();
+}
+
 // static
 bool WmShellMus::IsActivationParent(::ui::Window* window) {
   return window && IsActivatableShellWindowId(
                        WmWindowMus::Get(window)->GetShellWindowId());
 }
 
-void WmShellMus::RemoveClientObserver() {
-  if (!client_)
-    return;
-
-  client_->RemoveObserver(this);
-  client_ = nullptr;
-}
-
 // TODO: support OnAttemptToReactivateWindow, http://crbug.com/615114.
 void WmShellMus::OnWindowTreeFocusChanged(::ui::Window* gained_focus,
                                           ::ui::Window* lost_focus) {
   WmWindowMus* gained_active = GetToplevelAncestor(gained_focus);
   WmWindowMus* lost_active = GetToplevelAncestor(gained_focus);
   if (gained_active == lost_active)
     return;
 
   FOR_EACH_OBSERVER(WmActivationObserver, activation_observers_,
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
-  DCHECK_EQ(client, client_);
-  RemoveClientObserver();
+  DCHECK_EQ(window_tree_client(), client);
+  client->RemoveObserver(this);
 }
 
 }  // namespace mus
 }  // namespace ash