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

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 420 matching lines @@
 }
 
 void Shell::OnMaximizeModeStarted() {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeStarted());
 }
 
 void Shell::OnMaximizeModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeEnded());
 }
 
-void Shell::OnRootWindowAdded(aura::Window* root_window) {
+void Shell::OnRootWindowAdded(WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnRootWindowAdded(root_window));
 }
 
 void Shell::CreateShelf() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     (*iter)->CreateShelf();
 }
 
-void Shell::OnShelfCreatedForRootWindow(aura::Window* root_window) {
+void Shell::OnShelfCreatedForRootWindow(WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver,
                     observers_,
                     OnShelfCreatedForRootWindow(root_window));
 }
 
 void Shell::CreateKeyboard() {
   if (in_mus_)
     return;
   // TODO(bshe): Primary root window controller may not be the controller to
   // attach virtual keyboard. See http://crbug.com/303429
@@ skipping 57 matching lines @@
 #endif
 
 void Shell::UpdateShelfVisibility() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     if ((*iter)->shelf_widget())
       (*iter)->UpdateShelfVisibility();
 }
 
-void Shell::OnShelfAlignmentChanged(aura::Window* root_window) {
+void Shell::OnShelfAlignmentChanged(WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver, observers_,
                     OnShelfAlignmentChanged(root_window));
 }
 
-void Shell::OnShelfAutoHideBehaviorChanged(aura::Window* root_window) {
+void Shell::OnShelfAutoHideBehaviorChanged(WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver, observers_,
                     OnShelfAutoHideBehaviorChanged(root_window));
 }
 
 void Shell::NotifyFullscreenStateChange(bool is_fullscreen,
-                                        aura::Window* root_window) {
+                                        WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnFullscreenStateChanged(
       is_fullscreen, root_window));
 }
 
 void Shell::CreateModalBackground(aura::Window* window) {
   if (!modality_filter_) {
     modality_filter_.reset(new SystemModalContainerEventFilter(this));
     AddPreTargetHandler(modality_filter_.get());
   }
   RootWindowControllerList controllers = GetAllRootWindowControllers();
@@ skipping 697 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash