Folds WmRootWindowController into RootWindowController

ash/common/wm_window.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_WINDOW_H_
 #define ASH_COMMON_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 24 matching lines @@
 }
 
 namespace views {
 class View;
 class Widget;
 }
 
 namespace ash {
 
 class ImmersiveFullscreenController;
+class RootWindowController;
 class WmLayoutManager;
-class WmRootWindowController;
 class WmShell;
 class WmTransientWindowObserver;
 class WmWindowObserver;
 enum class WmWindowProperty;
 
 namespace wm {
 class WindowState;
 }
 
 // This class exists as a porting layer to allow ash/wm to work with
 // aura::Window or ui::Window. See aura::Window for details on the functions.
 class ASH_EXPORT WmWindow {
  public:
   // See comments in SetBoundsInScreen().
   enum class BoundsInScreenBehavior {
     USE_LOCAL_COORDINATES,
     USE_SCREEN_COORDINATES,
   };
 
   using Windows = std::vector<WmWindow*>;
 
   virtual void Destroy() = 0;
 
   WmWindow* GetRootWindow() {
     return const_cast<WmWindow*>(
         const_cast<const WmWindow*>(this)->GetRootWindow());
   }
   virtual const WmWindow* GetRootWindow() const = 0;
-  virtual WmRootWindowController* GetRootWindowController() = 0;
+  virtual RootWindowController* GetRootWindowController() = 0;
 
   // TODO(sky): fix constness.
   virtual WmShell* GetShell() const = 0;
 
   // Used for debugging.
   virtual void SetName(const char* name) = 0;
   virtual std::string GetName() const = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
   virtual base::string16 GetTitle() const = 0;
@@ skipping 252 matching lines @@
   virtual void AddLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
   virtual void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
 
  protected:
   virtual ~WmWindow() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WINDOW_H_