Folds WmRootWindowController into RootWindowController

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 70736519a79e7cb2b8db3c19b20d6d03770ff119..a5589c97dc72bbb9f31cfa895da91c242b77ccf4 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -65,6 +65,7 @@ class MediaController;
 class MruWindowTracker;
 class NewWindowController;
 class PaletteDelegate;
+class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionController;
 class SessionStateDelegate;
@@ -88,7 +89,6 @@ class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class WmRootWindowController;
 class WmWindow;
 class WorkspaceEventHandler;
 
@@ -225,7 +225,7 @@ class ASH_EXPORT WmShell {
   virtual WmWindow* GetCaptureWindow() = 0;
 
   // Convenience for GetPrimaryRootWindow()->GetRootWindowController().
-  WmRootWindowController* GetPrimaryRootWindowController();
+  RootWindowController* GetPrimaryRootWindowController();
 
   virtual WmWindow* GetPrimaryRootWindow() = 0;