ash: Move AppList support to ShelfWidget, expose ShelfWidget in WmShelf

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.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf.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_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 16 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());
-  WmShelf* shelf = Shelf::ForWindow(WmWindowAura::Get(window))->wm_shelf();
+  WmShelf* shelf = WmShelf::ForWindow(WmWindowAura::Get(window));
   switch (shelf->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(WmLookup::Get()->GetWindowForWidget(widget))
-          ->wm_shelf()
+      WmShelf::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),
@@ skipping 82 matching lines @@
   // 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);
-  Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(container));
-  AppListButton* applist_button = shelf->GetAppListButton();
+  WmShelf* shelf = WmShelf::ForWindow(WmWindowAura::Get(container));
+  AppListButton* applist_button = shelf->shelf_widget()->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_) {
@@ skipping 24 matching lines @@
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->AddObserver(this);
   Shell::GetInstance()->AddPreTargetHandler(this);
   WmWindow* window = WmShell::Get()->GetRootWindowForDisplayId(display_id);
   window->GetRootWindowController()->GetShelf()->AddObserver(this);
 
   // By setting us as DnD recipient, the app list knows that we can
   // handle items.
   view->SetDragAndDropHostOfCurrentAppList(
-      shelf->GetDragAndDropHostForAppList());
+      shelf->shelf_widget()->GetDragAndDropHostForAppList());
 }
 
 void AppListPresenterDelegate::OnShown(int64_t display_id) {
   is_visible_ = true;
   // Update applist button status when app list visibility is changed.
   WmWindow* root_window = WmShell::Get()->GetRootWindowForDisplayId(display_id);
-  Shelf::ForWindow(root_window)->GetAppListButton()->OnAppListShown();
+  WmShelf::ForWindow(root_window)
+      ->shelf_widget()
+      ->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.
-  Shelf* shelf =
-      Shelf::ForWindow(WmLookup::Get()->GetWindowForWidget(view_->GetWidget()));
-  shelf->shelf_layout_manager()->UpdateAutoHideState();
+  WmShelf* shelf = WmShelf::ForWindow(
+      WmLookup::Get()->GetWindowForWidget(view_->GetWidget()));
+  shelf->UpdateAutoHideState();
 
   // Update applist button status when app list visibility is changed.
-  shelf->GetAppListButton()->OnAppListDismissed();
+  shelf->shelf_widget()->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.
-  Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(root_window));
-  shelf->shelf_layout_manager()->UpdateAutoHideState();
+  WmShelf* shelf = WmShelf::ForWindow(WmWindowAura::Get(root_window));
+  shelf->UpdateAutoHideState();
 
-  switch (shelf->wm_shelf()->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, WmShelfObserver implementation:
 
 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace ash