mash: Migrate Shelf aura::Window uses to WmWindow.

ash/app_list/app_list_presenter_delegate.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/app_list/app_list_presenter_delegate.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
@@ skipping 17 matching lines @@
 namespace {
 
 // The minimal anchor position offset to make sure that the bubble is still on
 // the screen with 8 pixels spacing on the left / right. This constant is a
 // result of minimal bubble arrow sizes and offsets.
 const int kMinimalAnchorPositionOffset = 57;
 
 // Gets arrow location based on shelf alignment.
 views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) {
   DCHECK(Shell::HasInstance());
-  switch (Shelf::ForWindow(window)->alignment()) {
+  switch (Shelf::ForWindow(WmWindowAura::Get(window))->alignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return views::BubbleBorder::BOTTOM_CENTER;
     case SHELF_ALIGNMENT_LEFT:
       return views::BubbleBorder::LEFT_CENTER;
     case SHELF_ALIGNMENT_RIGHT:
       return views::BubbleBorder::RIGHT_CENTER;
   }
   NOTREACHED();
   return views::BubbleBorder::BOTTOM_CENTER;
 }
 
 // Using |button_bounds|, determine the anchor offset so that the bubble gets
 // shown above the shelf (used for the alternate shelf theme).
 gfx::Vector2d GetAnchorPositionOffsetToShelf(const gfx::Rect& button_bounds,
                                              views::Widget* widget) {
   DCHECK(Shell::HasInstance());
   ShelfAlignment shelf_alignment =
-      Shelf::ForWindow(widget->GetNativeView()->GetRootWindow())->alignment();
+      Shelf::ForWindow(WmLookup::Get()->GetWindowForWidget(widget))
+          ->alignment();
   gfx::Point anchor(button_bounds.CenterPoint());
   switch (shelf_alignment) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       if (base::i18n::IsRTL()) {
         int screen_width = widget->GetWorkAreaBoundsInScreen().width();
         return gfx::Vector2d(
             std::min(screen_width - kMinimalAnchorPositionOffset - anchor.x(),
                      0),
             0);
@@ skipping 57 matching lines @@
     : presenter_(presenter), view_delegate_factory_(view_delegate_factory) {
   WmShell::Get()->AddShellObserver(this);
 }
 
 AppListPresenterDelegate::~AppListPresenterDelegate() {
   DCHECK(view_);
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
-  views::Widget* widget = view_->GetWidget();
   Shell::GetInstance()->RemovePreTargetHandler(this);
-  Shelf::ForWindow(widget->GetNativeWindow())->RemoveIconObserver(this);
+  WmWindow* window = WmLookup::Get()->GetWindowForWidget(view_->GetWidget());
+  Shelf::ForWindow(window)->RemoveIconObserver(this);
   WmShell::Get()->RemoveShellObserver(this);
 }
 
 app_list::AppListViewDelegate* AppListPresenterDelegate::GetViewDelegate() {
   return view_delegate_factory_->GetDelegate();
 }
 
 void AppListPresenterDelegate::Init(app_list::AppListView* view,
                                     int64_t display_id,
                                     int current_apps_page) {
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
   ash::Shell::GetPrimaryRootWindowController()
       ->GetShelfLayoutManager()
       ->UpdateAutoHideState();
   view_ = view;
   aura::Window* root_window = Shell::GetInstance()
                                   ->window_tree_host_manager()
                                   ->GetRootWindowForDisplayId(display_id);
   aura::Window* container = GetRootWindowController(root_window)
                                 ->GetContainer(kShellWindowId_AppListContainer);
-  AppListButton* applist_button =
-      Shelf::ForWindow(container)->GetAppListButton();
+  Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(container));
+  AppListButton* applist_button = shelf->GetAppListButton();
   is_centered_ = view->ShouldCenterWindow();
   bool is_fullscreen = IsFullscreenAppListEnabled() &&
                        WmShell::Get()
                            ->maximize_mode_controller()
                            ->IsMaximizeModeWindowManagerEnabled();
   if (is_fullscreen) {
     view->InitAsFramelessWindow(
         container, current_apps_page,
         ScreenUtil::GetDisplayWorkAreaBoundsInParent(container));
   } else if (is_centered_) {
     // Note: We can't center the app list until we have its dimensions, so we
     // init at (0, 0) and then reset its anchor point.
     view->InitAsBubbleAtFixedLocation(container, current_apps_page,
                                       gfx::Point(), views::BubbleBorder::FLOAT,
                                       true /* border_accepts_events */);
     // The experimental app list is centered over the display of the app list
     // button that was pressed (if triggered via keyboard, this is the display
     // with the currently focused window).
     view->SetAnchorPoint(GetCenterOfDisplayForView(
         applist_button, GetMinimumBoundsHeightForAppList(view)));
   } else {
     gfx::Rect applist_button_bounds = applist_button->GetBoundsInScreen();
     // We need the location of the button within the local screen.
     applist_button_bounds =
         ScreenUtil::ConvertRectFromScreen(root_window, applist_button_bounds);
     view->InitAsBubbleAttachedToAnchor(
-        container, current_apps_page,
-        Shelf::ForWindow(container)->GetAppListButton(),
-        GetAnchorPositionOffsetToShelf(
-            applist_button_bounds,
-            Shelf::ForWindow(container)->GetAppListButton()->GetWidget()),
+        container, current_apps_page, applist_button,
+        GetAnchorPositionOffsetToShelf(applist_button_bounds,
+                                       applist_button->GetWidget()),
         GetBubbleArrow(container), true /* border_accepts_events */);
     view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
   }
 
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->AddObserver(this);
   Shell::GetInstance()->AddPreTargetHandler(this);
-  views::Widget* widget = view->GetWidget();
-  Shelf::ForWindow(widget->GetNativeWindow())->AddIconObserver(this);
+  shelf->AddIconObserver(this);
 
   // By setting us as DnD recipient, the app list knows that we can
   // handle items.
   view->SetDragAndDropHostOfCurrentAppList(
-      Shelf::ForWindow(root_window)->GetDragAndDropHostForAppList());
+      shelf->GetDragAndDropHostForAppList());
 }
 
 void AppListPresenterDelegate::OnShown(int64_t display_id) {
   is_visible_ = true;
   // Update applist button status when app list visibility is changed.
-  aura::Window* root_window = Shell::GetInstance()
-                                  ->window_tree_host_manager()
-                                  ->GetRootWindowForDisplayId(display_id);
+  WmWindow* root_window = WmShell::Get()->GetRootWindowForDisplayId(display_id);
   Shelf::ForWindow(root_window)->GetAppListButton()->OnAppListShown();
 }
 
 void AppListPresenterDelegate::OnDismissed() {
   DCHECK(is_visible_);
   DCHECK(view_);
 
   is_visible_ = false;
 
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
-  Shell::GetPrimaryRootWindowController()
-      ->GetShelfLayoutManager()
-      ->UpdateAutoHideState();
+  Shelf* shelf =
+      Shelf::ForWindow(WmLookup::Get()->GetWindowForWidget(view_->GetWidget()));
+  shelf->shelf_layout_manager()->UpdateAutoHideState();
 
   // Update applist button status when app list visibility is changed.
-  Shelf::ForWindow(view_->GetWidget()->GetNativeView())
-      ->GetAppListButton()
-      ->OnAppListDismissed();
+  shelf->GetAppListButton()->OnAppListDismissed();
 }
 
 void AppListPresenterDelegate::UpdateBounds() {
   if (!view_ || !is_visible_)
     return;
 
   view_->UpdateBounds();
 
   if (is_centered_) {
     view_->SetAnchorPoint(GetCenterOfDisplayForView(
         view_, GetMinimumBoundsHeightForAppList(view_)));
   }
 }
 
 gfx::Vector2d AppListPresenterDelegate::GetVisibilityAnimationOffset(
     aura::Window* root_window) {
   DCHECK(Shell::HasInstance());
 
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
-  Shell::GetPrimaryRootWindowController()
-      ->GetShelfLayoutManager()
-      ->UpdateAutoHideState();
+  Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(root_window));
+  shelf->shelf_layout_manager()->UpdateAutoHideState();
 
-  switch (Shelf::ForWindow(root_window)->alignment()) {
+  switch (shelf->alignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return gfx::Vector2d(0, kAnimationOffset);
     case SHELF_ALIGNMENT_LEFT:
       return gfx::Vector2d(-kAnimationOffset, 0);
     case SHELF_ALIGNMENT_RIGHT:
       return gfx::Vector2d(kAnimationOffset, 0);
   }
   NOTREACHED();
   return gfx::Vector2d();
@@ skipping 82 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterDelegate, ShelfIconObserver implementation:
 
 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace ash