Cleanup WorkspaceController and WorkspaceLayoutManager.

ash/wm/workspace/workspace_layout_manager.h

 // Copyright (c) 2012 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_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <set>
 
@@ skipping 12 matching lines @@
 namespace aura {
 class RootWindow;
 class Window;
 }
 
 namespace ui {
 class Layer;
 }
 
 namespace ash {
-class ShelfLayoutManager;
+class RootWindowController;
 class WorkspaceLayoutManagerDelegate;
 
 namespace wm {
 class WindowState;
 class WMEvent;
 }
 
 // LayoutManager used on the window created for a workspace.
 class ASH_EXPORT WorkspaceLayoutManager
     : public aura::LayoutManager,
       public aura::WindowObserver,
       public aura::client::ActivationChangeObserver,
       public keyboard::KeyboardControllerObserver,
       public ShellObserver,
       public wm::WindowStateObserver {
  public:
   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.
   void SetMaximizeBackdropDelegate(
       std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate);
 
   // Overridden from aura::LayoutManager:
   void OnWindowResized() override {}
   void OnWindowAddedToLayout(aura::Window* child) override;
   void OnWillRemoveWindowFromLayout(aura::Window* child) override;
@@ skipping 38 matching lines @@
 
   // Adjusts the bounds of all managed windows when the display area changes.
   // This happens when the display size, work area insets has changed.
   // If this is called for a display size change (i.e. |event|
   // is DISPLAY_RESIZED), the non-maximized/non-fullscreen
   // windows are readjusted to make sure the window is completely within the
   // display region. Otherwise, it makes sure at least some parts of the window
   // 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();
 
   // Updates the bounds of the window for a stte type change from
   // |old_show_type|.
   void UpdateBoundsFromStateType(wm::WindowState* window_state,
                                  wm::WindowStateType old_state_type);
 
   // If |window_state| is maximized or fullscreen the bounds of the
   // window are set and true is returned. Does nothing otherwise.
   bool SetMaximizedOrFullscreenBounds(wm::WindowState* window_state);
 
   // 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_;
 
   // The work area in the coordinates of |window_|.
   gfx::Rect work_area_in_parent_;
 
   // True if this workspace is currently in fullscreen mode.
   bool is_fullscreen_;
 
   // A window which covers the full container and which gets inserted behind the
   // topmost visible window.
   std::unique_ptr<WorkspaceLayoutManagerDelegate> backdrop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_