Folds WmRootWindowController into RootWindowController

ash/common/wm/dock/docked_window_layout_manager.h

Index: ash/common/wm/dock/docked_window_layout_manager.h
diff --git a/ash/common/wm/dock/docked_window_layout_manager.h b/ash/common/wm/dock/docked_window_layout_manager.h
index 7704465c79603ab31435a5fbe131d8c9de7f1fcb..d7e0977bc96aec14142247996e8edea651ec8e06 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.h
+++ b/ash/common/wm/dock/docked_window_layout_manager.h
@@ -27,7 +27,7 @@ namespace ash {
 class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
-class WmRootWindowController;
+class RootWindowController;
 class WmShelf;
 
 // DockedWindowLayoutManager is responsible for organizing windows when they are
@@ -252,7 +252,7 @@ class ASH_EXPORT DockedWindowLayoutManager
   // Parent window associated with this layout manager.
   WmWindow* dock_container_;
 
-  WmRootWindowController* root_window_controller_;
+  RootWindowController* root_window_controller_;
 
   // Protect against recursive calls to Relayout().
   bool in_layout_;