Cleanup WorkspaceController and WorkspaceLayoutManager.

ash/wm/workspace/workspace_layout_manager.h

Index: ash/wm/workspace/workspace_layout_manager.h
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
index 7685356ed23828d76e25e175dd5e3259e1ea7255..eab7d054ea83382731ce33d0bec02384b6144cf2 100644
--- a/ash/wm/workspace/workspace_layout_manager.h
+++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -30,7 +30,7 @@ class Layer;
 }
 
 namespace ash {
-class ShelfLayoutManager;
+class RootWindowController;
 class WorkspaceLayoutManagerDelegate;
 
 namespace wm {
@@ -50,8 +50,6 @@ class ASH_EXPORT WorkspaceLayoutManager
   explicit WorkspaceLayoutManager(aura::Window* window);
   ~WorkspaceLayoutManager() override;
 
-  void SetShelf(ShelfLayoutManager* shelf);
-
   // A delegate which can be set to add a backdrop behind the top most visible
   // window. With the call the ownership of the delegate will be transferred to
   // the WorkspaceLayoutManager.
@@ -110,9 +108,6 @@ class ASH_EXPORT WorkspaceLayoutManager
   // is on display.
   void AdjustAllWindowsBoundsForWorkAreaChange(const wm::WMEvent* event);
 
-  // Updates the visibility state of the shelf.
-  void UpdateShelfVisibility();
-
   // Updates the fullscreen state of the workspace and notifies Shell if it
   // has changed.
   void UpdateFullscreenState();
@@ -129,9 +124,9 @@ class ASH_EXPORT WorkspaceLayoutManager
   // Animates the window bounds to |bounds|.
   void SetChildBoundsAnimated(aura::Window* child, const gfx::Rect& bounds);
 
-  ShelfLayoutManager* shelf_;
   aura::Window* window_;
   aura::Window* root_window_;
+  RootWindowController* root_window_controller_;
 
   // Set of windows we're listening to.
   WindowSet windows_;