[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/shelf/shelf.cc

 // Copyright 2016 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.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ skipping 87 matching lines @@
     case LoginStatus::KIOSK_APP:
     case LoginStatus::ARC_KIOSK_APP:
     case LoginStatus::NOT_LOGGED_IN:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
-void Shelf::CreateShelfWidget(WmWindow* root) {
+void Shelf::CreateShelfWidget(aura::Window* root) {
   DCHECK(!shelf_widget_);
-  WmWindow* shelf_container =
-      root->GetChildByShellWindowId(kShellWindowId_ShelfContainer);
+  aura::Window* shelf_container =
+      root->GetChildById(kShellWindowId_ShelfContainer);
   shelf_widget_.reset(new ShelfWidget(shelf_container, this));
 
   DCHECK(!shelf_layout_manager_);
   shelf_layout_manager_ = shelf_widget_->shelf_layout_manager();
   shelf_layout_manager_->AddObserver(this);
 
   // Must occur after |shelf_widget_| is constructed because the system tray
   // constructors call back into Shelf::shelf_widget().
   DCHECK(!shelf_widget_->status_area_widget());
-  WmWindow* status_container =
-      root->GetChildByShellWindowId(kShellWindowId_StatusContainer);
+  aura::Window* status_container =
+      root->GetChildById(kShellWindowId_StatusContainer);
   shelf_widget_->CreateStatusAreaWidget(status_container);
 }
 
 void Shelf::ShutdownShelfWidget() {
   if (shelf_widget_)
     shelf_widget_->Shutdown();
 }
 
 void Shelf::DestroyShelfWidget() {
   shelf_widget_.reset();
 }
 
 void Shelf::NotifyShelfInitialized() {
   DCHECK(shelf_layout_manager_);
   DCHECK(shelf_widget_);
   Shell::Get()->shelf_controller()->NotifyShelfInitialized(this);
 }
 
-WmWindow* Shelf::GetWindow() {
-  return WmWindow::Get(shelf_widget_->GetNativeWindow());
+aura::Window* Shelf::GetWindow() {
+  return shelf_widget_->GetNativeWindow();
 }
 
 void Shelf::SetAlignment(ShelfAlignment alignment) {
   DCHECK(shelf_layout_manager_);
 
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
@@ skipping 76 matching lines @@
 
 gfx::Rect Shelf::GetIdealBounds() {
   return shelf_layout_manager_->GetIdealBounds();
 }
 
 gfx::Rect Shelf::GetUserWorkAreaBounds() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->user_work_area_bounds()
                                : gfx::Rect();
 }
 
-void Shelf::UpdateIconPositionForPanel(WmWindow* panel) {
+void Shelf::UpdateIconPositionForPanel(aura::Window* panel) {
   shelf_widget_->UpdateIconPositionForPanel(panel);
 }
 
-gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
+gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(aura::Window* window) {
   if (!shelf_widget_)
     return gfx::Rect();
   return shelf_widget_->GetScreenBoundsOfItemIconForWindow(window);
 }
 
 // static
 void Shelf::LaunchShelfItem(int item_index) {
   ShelfModel* shelf_model = Shell::Get()->shelf_model();
   const ShelfItems& items = shelf_model->items();
   int item_count = shelf_model->item_count();
@@ skipping 99 matching lines @@
 
 void Shelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                 AnimationChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   for (auto& observer : observers_)
     observer.OnBackgroundTypeChanged(background_type, change_type);
 }
 
 }  // namespace ash