Converts ShellObserver from aura::Window to ash::WmWindow

ash/shelf/shelf_window_watcher.h

 // Copyright 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_SHELF_SHELF_WINDOW_WATCHER_H_
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 
 #include <stdint.h>
 
 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
@@ skipping 11 matching lines @@
 namespace client {
 class ActivationClient;
 }
 
 }  // namespace aura
 
 namespace ash {
 
 class ShelfModel;
 class ShelfItemDelegateManager;
+class WmWindow;
 
 // ShelfWindowWatcher creates and handles a ShelfItem for windows that have
 // a ShelfItemDetails property in the default container.
 class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
                            public aura::WindowObserver,
                            public display::DisplayObserver {
  public:
   ShelfWindowWatcher(ShelfModel* model,
                      ShelfItemDelegateManager* item_delegate_manager);
   ~ShelfWindowWatcher() override;
@@ skipping 32 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(RemovedWindowObserver);
   };
 
   // Creates a ShelfItem for |window| that has ShelfItemDetails.
   void AddShelfItem(aura::Window* window);
 
   // Removes a ShelfItem for |window|.
   void RemoveShelfItem(aura::Window* window);
 
-  // Adds observer to default container and ActivationClient of |root_window|.
-  void OnRootWindowAdded(aura::Window* root_window);
+  // Adds observer to default container and ActivationClient of
+  // |root_window_wm|.
+  void OnRootWindowAdded(WmWindow* root_window_wm);
 
   // Removes observer from ActivationClient of |root_window|.
   void OnRootWindowRemoved(aura::Window* root_window);
 
   // Updates the status of ShelfItem for |window|.
   void UpdateShelfItemStatus(aura::Window* window, bool is_active);
 
   // Returns the index of ShelfItem associated with |window|.
   int GetShelfItemIndexForWindow(aura::Window* window) const;
 
@@ skipping 47 matching lines @@
   // Holds all observed activation clients.
   ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
       aura::client::ActivationChangeObserver> observed_activation_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_H_