Merges RootWindowControllerCommon into WmRootWindowController

ash/root_window_controller.h

 // Copyright (c) 2012 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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 37 matching lines @@
 class ScopedCaptureClient;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 class AlwaysOnTopController;
 class AnimatingWallpaperWidgetController;
 class DockedWindowLayoutManager;
 enum class LoginStatus;
 class PanelLayoutManager;
-class RootWindowControllerCommon;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfWidget;
 class StackingController;
 class StatusAreaWidget;
 class SystemModalContainerLayoutManager;
 class SystemTray;
 class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WallpaperWidgetController;
+class WmRootWindowControllerAura;
 class WmShelfAura;
 class WmWindow;
 class WorkspaceController;
 
 #if defined(OS_CHROMEOS)
 class BootSplashScreen;
 class AshTouchExplorationManager;
 #endif
 
 // This class maintains the per root window state for ash. This class
@@ skipping 183 matching lines @@
 
   // Callback for MenuModelAdapter.
   void OnMenuClosed();
 
   // Overridden from ShellObserver.
   void OnLoginStateChanged(LoginStatus status) override;
   void OnTouchHudProjectionToggled(bool enabled) override;
 
   std::unique_ptr<AshWindowTreeHost> ash_host_;
 
-  std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
+  // Owned by the root window.
+  WmRootWindowControllerAura* wm_root_window_controller_ = nullptr;
 
   std::unique_ptr<StackingController> stacking_controller_;
 
   // The shelf controller for this root window. Exists for the entire lifetime
   // of the RootWindowController so that it is safe for observers to be added
   // to it during construction of the shelf widget and status tray.
   std::unique_ptr<WmShelfAura> wm_shelf_aura_;
 
   // Legacy shelf controller. Only present after shelf is created (post-login).
   std::unique_ptr<Shelf> shelf_;
@@ skipping 48 matching lines @@
 
 // On classic ash, returns the RootWindowController for the given |root_window|.
 // On mus ash, returns the RootWindowController for the primary display.
 // See RootWindowController class comment above.
 ASH_EXPORT RootWindowController* GetRootWindowController(
     const aura::Window* root_window);
 
 }  // namespace ash
 
 #endif  // ASH_ROOT_WINDOW_CONTROLLER_H_