Removes WmRootWindowController subclasses

ash/mus/bridge/wm_window_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_window_mus.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_transient_window_observer.h"
 #include "ash/common/wm_window_observer.h"
 #include "ash/common/wm_window_property.h"
-#include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/property_util.h"
+#include "ash/mus/root_window_controller.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
@@ skipping 21 matching lines @@
   // WmWindowMus is owned by the aura::Window.
   // Unfortunately there isn't a good way to avoid the cast here.
   return new WmWindowMus(const_cast<aura::Window*>(window));
 }
 
 // static
 WmWindowMus* WmWindowMus::Get(views::Widget* widget) {
   return WmWindowMus::Get(widget->GetNativeView());
 }
 
-const WmRootWindowControllerMus* WmWindowMus::GetRootWindowControllerMus()
-    const {
-  return WmRootWindowControllerMus::Get(aura_window()->GetRootWindow());
-}
-
 bool WmWindowMus::IsContainer() const {
   return GetShellWindowId() != kShellWindowId_Invalid;
 }
 
 WmRootWindowController* WmWindowMus::GetRootWindowController() {

[James Cook, 2017/01/10 22:41:13]

Could this override be eliminated in favor of WmWindowAura's version? If not,
should this be using aura_window()->GetRootWindow()?

[sky, 2017/01/10 23:06:56]

Good call. WmWindowAura's implementation works as long as change assertions in
RootWindowController::ForWindow.

-  return GetRootWindowControllerMus();
+  return RootWindowController::ForWindow(aura_window())
+      ->ash_root_window_controller()
+      ->wm_root_window_controller();
 }
 
 WmShell* WmWindowMus::GetShell() const {
   return WmShellMus::Get();
 }
 
 void WmWindowMus::CloseWidget() {
   // NOTE: in the FOR_CLIENT case there is not necessarily a widget associated
   // with the window. Mash only creates widgets for top level windows if mash
   // renders the non-client frame.
   if (aura_window()->GetProperty(kWidgetCreationTypeKey) ==
       WidgetCreationType::FOR_CLIENT) {
     WmShellMus::Get()->window_manager()->window_manager_client()->RequestClose(
         aura_window());
   } else {
     WmWindowAura::CloseWidget();
   }
 }
 
 void WmWindowMus::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
   DCHECK(WmShellMus::Get()->window_tree_client()->WasCreatedByThisClient(
       aura::WindowMus::Get(aura_window())));
   WmWindowAura::AddLimitedPreTargetHandler(handler);
 }
 
 }  // namespace mus
 }  // namespace ash