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

ash/shelf/shelf_window_watcher.cc

 // 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.
 
 #include "ash/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_item_delegate_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
@@ skipping 89 matching lines @@
     : model_(model),
       item_delegate_manager_(item_delegate_manager),
       root_window_observer_(this),
       removed_window_observer_(this),
       observed_windows_(this),
       observed_root_windows_(&root_window_observer_),
       observed_removed_windows_(&removed_window_observer_),
       observed_activation_clients_(this) {
   // We can't assume all RootWindows have the same ActivationClient.
   // Add a RootWindow and its ActivationClient to the observed list.
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::const_iterator it = root_windows.begin();
-       it != root_windows.end(); ++it)
-    OnRootWindowAdded(*it);
+  for (aura::Window* root : Shell::GetAllRootWindows())
+    OnRootWindowAdded(WmWindowAura::Get(root));
 
   display::Screen::GetScreen()->AddObserver(this);
 }
 
 ShelfWindowWatcher::~ShelfWindowWatcher() {
   display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 void ShelfWindowWatcher::AddShelfItem(aura::Window* window) {
   const ShelfItemDetails* item_details =
       GetShelfItemDetailsForWindow(window);
   ShelfItem item;
   ShelfID id = model_->next_id();
   item.status = wm::IsActiveWindow(window) ? STATUS_ACTIVE: STATUS_RUNNING;
   SetShelfItemDetailsForShelfItem(&item, *item_details);
   SetShelfIDForWindow(id, window);
   std::unique_ptr<ShelfItemDelegate> item_delegate(
       new ShelfWindowWatcherItemDelegate(window));
   // |item_delegate| is owned by |item_delegate_manager_|.
   item_delegate_manager_->SetShelfItemDelegate(id, std::move(item_delegate));
   model_->Add(item);
 }
 
 void ShelfWindowWatcher::RemoveShelfItem(aura::Window* window) {
   model_->RemoveItemAt(model_->ItemIndexByID(GetShelfIDForWindow(window)));
   SetShelfIDForWindow(kInvalidShelfID, window);
 }
 
-void ShelfWindowWatcher::OnRootWindowAdded(aura::Window* root_window) {
+void ShelfWindowWatcher::OnRootWindowAdded(WmWindow* root_window_wm) {
+  aura::Window* root_window = WmWindowAura::GetAuraWindow(root_window_wm);
   // |observed_activation_clients_| can have the same ActivationClient multiple
   // times - which would be handled by the |observed_activation_clients_|.
   observed_activation_clients_.Add(
       aura::client::GetActivationClient(root_window));
   observed_root_windows_.Add(root_window);
 
   aura::Window* default_container = Shell::GetContainer(
       root_window,
       kShellWindowId_DefaultContainer);
   observed_windows_.Add(default_container);
@@ skipping 109 matching lines @@
 
 void ShelfWindowWatcher::OnDisplayAdded(const display::Display& new_display) {
   // Add a new RootWindow and its ActivationClient to observed list.
   aura::Window* root_window = Shell::GetInstance()
                                   ->window_tree_host_manager()
                                   ->GetRootWindowForDisplayId(new_display.id());
 
   // When the primary root window's display get removed, the existing root
   // window is taken over by the new display and the observer is already set.
   if (!observed_root_windows_.IsObserving(root_window))
-    OnRootWindowAdded(root_window);
+    OnRootWindowAdded(WmWindowAura::Get(root_window));
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
   // When this is called, RootWindow of |old_display| is already removed.
   // Instead, we remove an observer from RootWindow and ActivationClient in the
   // OnRootWindowDestroyed().
   // Do nothing here.
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash