Replace WmWindowObserver with aura::WindowObserver.

ash/common/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_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 #define ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 
 #include <list>
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/window_state_observer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_layout_manager.h"
-#include "ash/common/wm_window_observer.h"
-#include "ash/common/wm_window_tracker.h"
+#include "ash/root_window_controller.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "ui/aura/window_observer.h"
+#include "ui/aura/window_tracker.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class Widget;
 }
@@ skipping 14 matching lines @@
 // 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 WmLayoutManager,
       public wm::WindowStateObserver,
       public WmActivationObserver,
       public WmDisplayObserver,
       public ShellObserver,
-      public WmWindowObserver,
+      public aura::WindowObserver,
       public keyboard::KeyboardControllerObserver,
       public WmShelfObserver {
  public:
   explicit PanelLayoutManager(WmWindow* panel_container);
   ~PanelLayoutManager() override;
 
   // Returns the PanelLayoutManager in the specified hierarchy. This searches
   // from the root of |window|.
   static PanelLayoutManager* Get(WmWindow* window);
 
@@ skipping 20 matching lines @@
   void OnWillRemoveWindowFromLayout(WmWindow* child) override;
   void OnWindowRemovedFromLayout(WmWindow* child) override;
   void OnChildWindowVisibilityChanged(WmWindow* child, bool visibile) override;
   void SetChildBounds(WmWindow* child,
                       const gfx::Rect& requested_bounds) override;
 
   // Overridden from ShellObserver:
   void OnOverviewModeEnded() override;
   void OnShelfAlignmentChanged(WmWindow* root_window) override;
 
-  // Overridden from WmWindowObserver
-  void OnWindowPropertyChanged(WmWindow* window,
-                               WmWindowProperty property) override;
+  // Overridden from aura::WindowObserver
+  void OnWindowPropertyChanged(aura::Window* window,
+                               const void* key,
+                               intptr_t old) override;
 
   // Overridden from wm::WindowStateObserver
   void OnPostWindowStateTypeChange(wm::WindowState* window_state,
                                    wm::WindowStateType old_type) override;
 
   // Overridden from WmActivationObserver
   void OnWindowActivated(WmWindow* gained_active,
                          WmWindow* lost_active) override;
 
   // Overridden from WindowTreeHostManager::Observer
@@ skipping 70 matching lines @@
   // Ordered list of unowned pointers to panel windows.
   PanelList panel_windows_;
   // The panel being dragged.
   WmWindow* dragged_panel_;
   // The shelf we are observing for shelf icon changes.
   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<WmWindowTracker> restore_windows_on_shelf_visible_;
+  std::unique_ptr<aura::WindowTracker> restore_windows_on_shelf_visible_;
 
   // The last active panel. Used to maintain stacking order even if no panels
   // are currently focused.
   WmWindow* last_active_panel_;
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_