Converts DockedWindowLayoutManager to use WmRootWindowControllerObserver

ash/wm/dock/docked_window_layout_manager.h

 // Copyright (c) 2013 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_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 #define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/shell_observer.h"
 #include "ash/wm/common/wm_activation_observer.h"
+#include "ash/wm/common/wm_root_window_controller_observer.h"
 #include "ash/wm/common/wm_snap_to_pixel_layout_manager.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "ash/wm/dock/dock_types.h"
 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/wm/window_state_observer.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
-namespace aura {
-class Window;
-}
-
-namespace gfx {
-class Point;
-}
-
-namespace views {
-class Widget;
-}
-
 namespace ash {
 class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
 class Shelf;
 class WorkspaceController;
 
+namespace wm {
+class WmRootWindowController;
+}
+
 // DockedWindowLayoutManager is responsible for organizing windows when they are
 // docked to the side of a screen. It is associated with a specific container
 // window (i.e. kShellWindowId_DockContainer) and controls the layout of any
 // windows added to that container.
 //
 // The constructor takes a |dock_container| argument which is expected to set
 // its layout manager to this instance, e.g.:
 // dock_container->SetLayoutManager(
 //     new DockedWindowLayoutManager(dock_container));
 //
 // TODO(varkha): extend BaseLayoutManager instead of LayoutManager to inherit
 // common functionality.
 class ASH_EXPORT DockedWindowLayoutManager
     : public wm::WmSnapToPixelLayoutManager,
-      public ash::ShellObserver,
+      public wm::WmRootWindowControllerObserver,
       public wm::WmWindowObserver,
       public wm::WmActivationObserver,
       public keyboard::KeyboardControllerObserver,
       public wm::WindowStateObserver {
  public:
   // Maximum width of the docked windows area.
   static const int kMaxDockWidth;
 
   // Minimum width of the docked windows area.
   static const int kMinDockWidth;
@@ skipping 71 matching lines @@
   // SnapLayoutManager:
   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;
 
-  // ash::ShellObserver:
-  void OnDisplayWorkAreaInsetsChanged() override;
-  void OnFullscreenStateChanged(bool is_fullscreen,
-                                aura::Window* root_window) override;
-  void OnShelfAlignmentChanged(aura::Window* root_window) override;
+  // wm::WmRootWindowControllerObserver:
+  void OnWorkAreaChanged() override;
+  void OnFullscreenStateChanged(bool is_fullscreen) override;
+  void OnShelfAlignmentChanged() override;
 
   // wm::WindowStateObserver:
   void OnPreWindowStateTypeChange(wm::WindowState* window_state,
                                   wm::WindowStateType old_type) override;
 
   // wm::WmWindowObserver:
   void OnWindowBoundsChanged(wm::WmWindow* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
   void OnWindowVisibilityChanging(wm::WmWindow* window, bool visible) override;
@@ skipping 85 matching lines @@
 
   // Called whenever the window stacking order needs to be updated (e.g. focus
   // changes or a window is moved).
   void UpdateStacking(wm::WmWindow* active_window);
 
   // keyboard::KeyboardControllerObserver:
   void OnKeyboardBoundsChanging(const gfx::Rect& keyboard_bounds) override;
 
   // Parent window associated with this layout manager.
   wm::WmWindow* dock_container_;
+
+  wm::WmRootWindowController* root_window_controller_;
+
   // Protect against recursive calls to Relayout().
   bool in_layout_;
 
   // A window that is being dragged (whether docked or not).
   // Windows are tracked by docked layout manager only if they are docked;
   // however we need to know if a window is being dragged in order to avoid
   // positioning it or even considering it for layout.
   wm::WmWindow* dragged_window_;
 
   // True if the window being dragged is currently docked.
@@ skipping 45 matching lines @@
 
   // Observers of dock bounds changes.
   base::ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_