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

ash/root_window_controller.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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 232 matching lines @@
 
   void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }
 
   // WorkspaceLayoutManagerDelegate:
   void UpdateShelfVisibility() override {
     if (shelf_)
       shelf_->UpdateVisibilityState();
   }
   void OnFullscreenStateChanged(bool is_fullscreen) override {
     if (shelf_) {
-      ash::Shell::GetInstance()->NotifyFullscreenStateChange(is_fullscreen,
-                                                             root_window_);
+      ash::Shell::GetInstance()->NotifyFullscreenStateChange(
+          is_fullscreen, WmWindowAura::Get(root_window_));
     }
   }
 
  private:
   aura::Window* root_window_;
   ShelfLayoutManager* shelf_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerDelegateImpl);
 };
 
@@ skipping 143 matching lines @@
   if (panel_layout_manager_)
     panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
   if (docked_layout_manager_) {
     docked_layout_manager_->SetShelf(wm_shelf_aura_.get());
     if (shelf_widget_->shelf_layout_manager())
       docked_layout_manager_->AddObserver(
           shelf_widget_->shelf_layout_manager());
   }
 
   // Notify shell observers that the shelf has been created.
-  Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow());
+  Shell::GetInstance()->OnShelfCreatedForRootWindow(
+      WmWindowAura::Get(GetRootWindow()));
 
   shelf_widget_->PostCreateShelf();
 }
 
 Shelf* RootWindowController::GetShelf() const {
   // TODO(jamescook): Shelf should be owned by this class, not by ShelfWidget.
   return shelf_widget_->shelf();
 }
 
 void RootWindowController::UpdateAfterLoginStatusChange(
@@ skipping 275 matching lines @@
   if (root_window_type == PRIMARY) {
     shell->InitKeyboard();
   } else {
     ash_host_->AsWindowTreeHost()->Show();
 
     // Create a shelf if a user is already logged in.
     if (shell->session_state_delegate()->NumberOfLoggedInUsers())
       CreateShelf();
 
     // Notify shell observers about new root window.
-    shell->OnRootWindowAdded(root_window);
+    shell->OnRootWindowAdded(WmWindowAura::Get(root_window));
   }
 
 #if defined(OS_CHROMEOS)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTouchExplorationMode)) {
     touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
   }
 #endif
 }
 
@@ skipping 162 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash