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

ash/shelf/shelf_widget.cc

 // Copyright 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/shelf/shelf_widget.h"
 
 #include "ash/animation/animation_change_type.h"
 #include "ash/focus_cycler.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_background_animator_observer.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_layout_manager.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 // The contents view of the Shelf. This view contains ShelfView and
 // sizes it to the width of the shelf minus the size of the status area.
 class ShelfWidget::DelegateView : public views::WidgetDelegate,
                                   public views::AccessiblePaneView,
                                   public ShelfBackgroundAnimatorObserver {
  public:
   explicit DelegateView(ShelfWidget* shelf);
@@ skipping 75 matching lines @@
 
 void ShelfWidget::DelegateView::OnBoundsChanged(const gfx::Rect& old_bounds) {
   opaque_background_.SetBounds(GetLocalBounds());
   opaque_foreground_.SetBounds(GetLocalBounds());
 }
 
 void ShelfWidget::DelegateView::UpdateShelfBackground(SkColor color) {
   opaque_background_.SetColor(color);
 }
 
-ShelfWidget::ShelfWidget(WmWindow* shelf_container, Shelf* shelf)
+ShelfWidget::ShelfWidget(aura::Window* shelf_container, Shelf* shelf)
     : shelf_(shelf),
       status_area_widget_(nullptr),
       delegate_view_(new DelegateView(this)),
       shelf_view_(new ShelfView(Shell::Get()->shelf_model(), shelf_, this)),
       background_animator_(SHELF_BACKGROUND_DEFAULT,
                            shelf_,
                            Shell::Get()->wallpaper_controller()),
       activating_as_fallback_(false) {
   DCHECK(shelf_container);
   DCHECK(shelf_);
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.name = "ShelfWidget";
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = delegate_view_;
-  shelf_container->GetRootWindowController()
-      ->ConfigureWidgetInitParamsForContainer(
-          this, shelf_container->aura_window()->id(), &params);
+  RootWindowController::ForWindow(shelf_container)
+      ->ConfigureWidgetInitParamsForContainer(this, shelf_container->id(),
+                                              &params);
   Init(params);
 
   // The shelf should not take focus when initially shown.
   set_focus_on_creation(false);
   SetContentsView(delegate_view_);
   delegate_view_->SetParentLayer(GetLayer());
 
   // The shelf view observes the shelf model and creates icons as items are
   // added to the model.
   shelf_view_->Init();
   GetContentsView()->AddChildView(shelf_view_);
 
   shelf_layout_manager_ = new ShelfLayoutManager(this, shelf_);
   shelf_layout_manager_->AddObserver(this);
-  shelf_container->aura_window()->SetLayoutManager(shelf_layout_manager_);
+  shelf_container->SetLayoutManager(shelf_layout_manager_);
   background_animator_.PaintBackground(
       shelf_layout_manager_->GetShelfBackgroundType(),
       AnimationChangeType::IMMEDIATE);
 
   views::Widget::AddObserver(this);
 
   // Calls back into |this| and depends on |shelf_view_|.
   background_animator_.AddObserver(this);
   background_animator_.AddObserver(delegate_view_);
 }
 
 ShelfWidget::~ShelfWidget() {
   // Must call Shutdown() before destruction.
   DCHECK(!status_area_widget_);
   background_animator_.RemoveObserver(delegate_view_);
   background_animator_.RemoveObserver(this);
   Shell::Get()->focus_cycler()->RemoveWidget(this);
   SetFocusCycler(nullptr);
   RemoveObserver(this);
 }
 
-void ShelfWidget::CreateStatusAreaWidget(WmWindow* status_container) {
+void ShelfWidget::CreateStatusAreaWidget(aura::Window* status_container) {
   DCHECK(status_container);
   DCHECK(!status_area_widget_);
-  status_area_widget_ =
-      new StatusAreaWidget(status_container->aura_window(), shelf_);
+  status_area_widget_ = new StatusAreaWidget(status_container, shelf_);
   status_area_widget_->CreateTrayViews();
   // NOTE: Container may be hidden depending on login/display state.
   status_area_widget_->Show();
   Shell::Get()->focus_cycler()->AddWidget(status_area_widget_);
   background_animator_.AddObserver(status_area_widget_);
-  status_container->aura_window()->SetLayoutManager(
-      new StatusAreaLayoutManager(this));
+  status_container->SetLayoutManager(new StatusAreaLayoutManager(this));
 }
 
 void ShelfWidget::SetPaintsBackground(ShelfBackgroundType background_type,
                                       AnimationChangeType change_type) {
   background_animator_.PaintBackground(background_type, change_type);
 }
 
 ShelfBackgroundType ShelfWidget::GetBackgroundType() const {
   return background_animator_.target_background_type();
 }
@@ skipping 69 matching lines @@
   if (status_area_widget_) {
     background_animator_.RemoveObserver(status_area_widget_);
     Shell::Get()->focus_cycler()->RemoveWidget(status_area_widget_);
     status_area_widget_->Shutdown();
     status_area_widget_ = nullptr;
   }
 
   CloseNow();
 }
 
-void ShelfWidget::UpdateIconPositionForPanel(WmWindow* panel) {
-  ShelfID id =
-      ShelfID::Deserialize(panel->aura_window()->GetProperty(kShelfIDKey));
+void ShelfWidget::UpdateIconPositionForPanel(aura::Window* panel) {
+  ShelfID id = ShelfID::Deserialize(panel->GetProperty(kShelfIDKey));
   if (id.IsNull())
     return;
 
-  WmWindow* shelf_window = WmWindow::Get(this->GetNativeWindow());
-  shelf_view_->UpdatePanelIconPosition(
-      id, shelf_window->ConvertRectFromScreen(panel->GetBoundsInScreen())
-              .CenterPoint());
+  aura::Window* shelf_window = this->GetNativeWindow();
+  gfx::Rect bounds = panel->GetBoundsInScreen();
+  ::wm::ConvertRectFromScreen(shelf_window, &bounds);
+  shelf_view_->UpdatePanelIconPosition(id, bounds.CenterPoint());
 }
 
-gfx::Rect ShelfWidget::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
-  ShelfID id =
-      ShelfID::Deserialize(window->aura_window()->GetProperty(kShelfIDKey));
+gfx::Rect ShelfWidget::GetScreenBoundsOfItemIconForWindow(
+    aura::Window* window) {
+  ShelfID id = ShelfID::Deserialize(window->GetProperty(kShelfIDKey));
   if (id.IsNull())
     return gfx::Rect();
 
   gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
   gfx::Point screen_origin;
   views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
   return gfx::Rect(screen_origin.x() + bounds.x(),
                    screen_origin.y() + bounds.y(), bounds.width(),
                    bounds.height());
 }
@@ skipping 19 matching lines @@
 void ShelfWidget::UpdateShelfItemBackground(SkColor color) {
   shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash