Refactors WindowResizers to use ash/wm/common

ash/wm/panels/panel_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_PANELS_PANEL_LAYOUT_MANAGER_H_
 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 
 #include <list>
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_icon_observer.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shell_observer.h"
+#include "ash/wm/common/shelf/wm_shelf_observer.h"
 #include "ash/wm/common/window_state_observer.h"
 #include "ash/wm/common/wm_activation_observer.h"
 #include "ash/wm/common/wm_display_observer.h"
 #include "ash/wm/common/wm_layout_manager.h"
 #include "ash/wm/common/wm_overview_mode_observer.h"
 #include "ash/wm/common/wm_root_window_controller_observer.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "ash/wm/common/wm_window_tracker.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 13 matching lines @@
 class Widget;
 }
 
 namespace ash {
 class PanelCalloutWidget;
 class Shelf;
 class ShelfLayoutManager;
 
 namespace wm {
 class WmRootWindowController;
+class WmShelf;
 }
 
 // PanelLayoutManager is responsible for organizing panels within the
 // workspace. It is associated with a specific container window (i.e.
 // kShellWindowId_PanelContainer) and controls the layout of any windows
 // added to that container.
 //
 // The constructor takes a |panel_container| argument which is expected to set
 // its layout manager to this instance, e.g.:
 // panel_container->SetLayoutManager(new PanelLayoutManager(panel_container));
 
 class ASH_EXPORT PanelLayoutManager
     : public wm::WmLayoutManager,
       public ShelfIconObserver,
       public wm::WindowStateObserver,
       public wm::WmActivationObserver,
       public wm::WmDisplayObserver,
       public wm::WmOverviewModeObserver,
       public wm::WmRootWindowControllerObserver,
       public wm::WmWindowObserver,
       public keyboard::KeyboardControllerObserver,
-      public ShelfLayoutManagerObserver {
+      public wm::WmShelfObserver {
  public:
   explicit PanelLayoutManager(wm::WmWindow* panel_container);
   ~PanelLayoutManager() override;
 
   // Returns the PanelLayoutManager in the specified hierarchy. This searches
   // from the root of |window|.
   static PanelLayoutManager* Get(wm::WmWindow* window);
 
   // Call Shutdown() before deleting children of panel_container.
   void Shutdown();
 
   void StartDragging(wm::WmWindow* panel);
   void FinishDragging();
 
   void ToggleMinimize(wm::WmWindow* panel);
 
   // Hide / Show the panel callout widgets.
   void SetShowCalloutWidgets(bool show);
 
   // Returns the callout widget (arrow) for |panel|.
   views::Widget* GetCalloutWidgetForPanel(wm::WmWindow* panel);
 
-  Shelf* shelf() { return shelf_; }
-  void SetShelf(Shelf* shelf);
+  wm::WmShelf* shelf() { return shelf_; }
+  void SetShelf(wm::WmShelf* shelf);
 
   // Overridden from wm::WmLayoutManager
   void OnWindowResized() override;
   void OnWindowAddedToLayout(wm::WmWindow* child) override;
   void OnWillRemoveWindowFromLayout(wm::WmWindow* child) override;
   void OnWindowRemovedFromLayout(wm::WmWindow* child) override;
   void OnChildWindowVisibilityChanged(wm::WmWindow* child,
                                       bool visibile) override;
   void SetChildBounds(wm::WmWindow* child,
                       const gfx::Rect& requested_bounds) override;
 
-  // Overridden from ShelfIconObserver
-  void OnShelfIconPositionsChanged() override;
-
   // Overridden from wm::WmOverviewModeObserver
   void OnOverviewModeEnded() override;
 
   // Overridden from wm::WmRootWindowControllerObserver
   void OnShelfAlignmentChanged() override;
 
   // Overridden from wm::WmWindowObserver
   void OnWindowPropertyChanged(wm::WmWindow* window,
                                wm::WmWindowProperty property,
                                intptr_t old) override;
 
   // Overridden from wm::WindowStateObserver
   void OnPostWindowStateTypeChange(wm::WindowState* window_state,
                                    wm::WindowStateType old_type) override;
 
   // Overridden from wm::WmActivationObserver
   void OnWindowActivated(wm::WmWindow* gained_active,
                          wm::WmWindow* lost_active) override;
 
   // Overridden from WindowTreeHostManager::Observer
   void OnDisplayConfigurationChanged() override;
 
-  // Overridden from ShelfLayoutManagerObserver
+  // Overridden from wm::WmShelfObserver
   void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
+  void OnShelfIconPositionsChanged() override;
 
  private:
   friend class PanelLayoutManagerTest;
   friend class PanelWindowResizerTest;
   friend class DockedWindowResizerTest;
   friend class DockedWindowLayoutManagerTest;
   friend class WorkspaceControllerTest;
   friend class AcceleratorControllerTest;
 
   views::Widget* CreateCalloutWidget();
@@ skipping 49 matching lines @@
   bool in_add_window_;
   // Protect against recursive calls to Relayout().
   bool in_layout_;
   // Indicates if the panel callout widget should be created.
   bool show_callout_widgets_;
   // Ordered list of unowned pointers to panel windows.
   PanelList panel_windows_;
   // The panel being dragged.
   wm::WmWindow* dragged_panel_;
   // The shelf we are observing for shelf icon changes.
-  Shelf* shelf_;
-  // The shelf layout manager being observed for visibility changes.
-  ShelfLayoutManager* shelf_layout_manager_;
+  wm::WmShelf* shelf_;
 
   // When not NULL, the shelf is hidden (i.e. full screen) and this tracks the
   // set of panel windows which have been temporarily hidden and need to be
   // restored when the shelf becomes visible again.
   std::unique_ptr<wm::WmWindowTracker> restore_windows_on_shelf_visible_;
 
   // The last active panel. Used to maintain stacking order even if no panels
   // are currently focused.
   wm::WmWindow* last_active_panel_;
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_