Folds WmRootWindowController into RootWindowController

ash/common/wm_shell.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 ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 47 matching lines @@
 class KeyEventWatcher;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class LocaleNotificationController;
 class LogoutConfirmationController;
 class MaximizeModeController;
 class MediaController;
 class MruWindowTracker;
 class NewWindowController;
 class PaletteDelegate;
+class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionController;
 class SessionStateDelegate;
 class ShelfController;
 class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
 class ShellObserver;
 class ShutdownController;
 class SystemTrayDelegate;
 class SystemTrayController;
 class SystemTrayNotifier;
 class ToastManager;
 class VpnList;
 class WallpaperController;
 class WallpaperDelegate;
 class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class WmRootWindowController;
 class WmWindow;
 class WorkspaceEventHandler;
 
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
@@ skipping 116 matching lines @@
 
   virtual WmWindow* NewWindow(ui::wm::WindowType window_type,
                               ui::LayerType layer_type) = 0;
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
 
   virtual WmWindow* GetCaptureWindow() = 0;
 
   // Convenience for GetPrimaryRootWindow()->GetRootWindowController().
-  WmRootWindowController* GetPrimaryRootWindowController();
+  RootWindowController* GetPrimaryRootWindowController();
 
   virtual WmWindow* GetPrimaryRootWindow() = 0;
 
   // Returns the root window for the specified display.
   virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Returns the root window that newly created windows should be added to.
   // Value can be temporarily overridden using ScopedRootWindowForNewWindows.
   // NOTE: this returns the root, newly created window should be added to the
   // appropriate container in the returned window.
@@ skipping 289 matching lines @@
   WmWindow* scoped_root_window_for_new_windows_ = nullptr;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_