mash: Migrate shelf app list button to wm common types

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
 #include "ash/accelerators/focus_manager_factory.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/gpu_support.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/login_status.h"
 #include "ash/common/pointer_watcher_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/app_list_shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/locale/locale_notification_controller.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 16 matching lines @@
 #include "ash/first_run/first_run_helper_impl.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "ash/keyboard_uma_event_filter.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/new_window_delegate.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/shelf_window_watcher.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_init_params.h"
 #include "ash/utility/screenshot_controller.h"
 #include "ash/wm/ash_focus_rules.h"
 #include "ash/wm/ash_native_cursor_manager.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
-#include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/display/display.h"
@@ skipping 54 matching lines @@
 #endif
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 
 namespace {
 
 using aura::Window;
 using views::Widget;
 
-// Returns the display id corresponding to window, or |GetTargetDisplayId()|
-// if |window| is null.
-int64_t GetDisplayIdForWindow(aura::Window* window) {
-  if (!window)
-    return Shell::GetTargetDisplayId();
-  return display::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
-}
-
 // A Corewm VisibilityController subclass that calls the Ash animation routine
 // so we can pick up our extended animations. See ash/wm/window_animations.h.
 class AshVisibilityController : public ::wm::VisibilityController {
  public:
   AshVisibilityController() {}
   ~AshVisibilityController() override {}
 
  private:
   // Overridden from ::wm::VisibilityController:
   bool CallAnimateOnChildWindowVisibilityChanged(aura::Window* window,
@@ skipping 127 matching lines @@
   // No context menus when screen is locked.
   if (session_state_delegate_->IsScreenLocked())
     return;
 
   aura::Window* root = WmWindowAura::GetAuraWindow(
       wm::GetRootWindowMatching(gfx::Rect(location_in_screen, gfx::Size())));
   GetRootWindowController(root)->ShowContextMenu(location_in_screen,
                                                  source_type);
 }
 
-void Shell::ShowAppList(aura::Window* window) {
-  // If the context window is not given, show it on the target root window.
-  wm_shell_->delegate()->GetAppListPresenter()->Show(
-      GetDisplayIdForWindow(window));
-}
-
-void Shell::DismissAppList() {
-  wm_shell_->delegate()->GetAppListPresenter()->Dismiss();
-}
-
-void Shell::ToggleAppList(aura::Window* window) {
-  // If the context window is not given, show it on the target root window.
-  wm_shell_->delegate()->GetAppListPresenter()->ToggleAppList(
-      GetDisplayIdForWindow(window));
-}
-
-bool Shell::IsApplistVisible() const {
-  return wm_shell_->delegate()->GetAppListPresenter()->IsVisible();
-}
-
-bool Shell::GetAppListTargetVisibility() const {
-  return wm_shell_->delegate()->GetAppListPresenter()->GetTargetVisibility();
-}
-
 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
   // Use translucent-style window frames for dialogs.
   return new CustomFrameViewAsh(widget);
 }
 
 void Shell::SetDisplayWorkAreaInsets(Window* contains,
                                      const gfx::Insets& insets) {
   if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow(
           contains, insets)) {
@@ skipping 180 matching lines @@
   ShelfWidget* shelf = GetPrimaryRootWindowController()->shelf_widget();
   return shelf && shelf->status_area_widget();
 }
 
 SystemTray* Shell::GetPrimarySystemTray() {
   return GetPrimaryRootWindowController()->GetSystemTray();
 }
 
 ShelfDelegate* Shell::GetShelfDelegate() {
   if (!shelf_delegate_) {
+    ShelfModel* shelf_model = wm_shell_->shelf_model();
     // Creates ShelfItemDelegateManager before ShelfDelegate.
+    // TODO(jamescook): Move this into WmShell.
     shelf_item_delegate_manager_.reset(
-        new ShelfItemDelegateManager(shelf_model_.get()));
+        new ShelfItemDelegateManager(shelf_model));
 
     shelf_delegate_.reset(
-        wm_shell_->delegate()->CreateShelfDelegate(shelf_model_.get()));
+        wm_shell_->delegate()->CreateShelfDelegate(shelf_model));
     std::unique_ptr<ShelfItemDelegate> controller(new AppListShelfItemDelegate);

[msw, 2016/07/20 17:33:50]

future: This should probably happen in shelf_view.cc with the button creation.

[James Cook, 2016/07/20 18:35:39]

Acknowledged.

 
     // Finding the shelf model's location of the app list and setting its
     // ShelfItemDelegate.
-    int app_list_index = shelf_model_->GetItemIndexForType(TYPE_APP_LIST);
+    int app_list_index = shelf_model->GetItemIndexForType(TYPE_APP_LIST);
     DCHECK_GE(app_list_index, 0);
-    ShelfID app_list_id = shelf_model_->items()[app_list_index].id;
+    ShelfID app_list_id = shelf_model->items()[app_list_index].id;
     DCHECK(app_list_id);
     shelf_item_delegate_manager_->SetShelfItemDelegate(app_list_id,
                                                        std::move(controller));
     shelf_window_watcher_.reset(new ShelfWindowWatcher(
-        shelf_model_.get(), shelf_item_delegate_manager_.get()));
+        shelf_model, shelf_item_delegate_manager_.get()));
   }
   return shelf_delegate_.get();
 }
 
 void Shell::SetTouchHudProjectionEnabled(bool enabled) {
   if (is_touch_hud_projection_enabled_ == enabled)
     return;
 
   is_touch_hud_projection_enabled_ = enabled;
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(),
@@ skipping 18 matching lines @@
       ->DoInitialAnimation();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
     : wm_shell_(new WmShellAura(base::WrapUnique(delegate))),
       target_root_window_(nullptr),
       scoped_target_root_window_(nullptr),
-      shelf_model_(new ShelfModel),
       link_handler_model_factory_(nullptr),
       activation_client_(nullptr),
 #if defined(OS_CHROMEOS)
       display_configurator_(new ui::DisplayConfigurator()),
 #endif  // defined(OS_CHROMEOS)
       native_cursor_manager_(nullptr),
       simulate_modal_window_open_for_testing_(false),
       is_touch_hud_projection_enabled_(false),
       blocking_pool_(blocking_pool) {
   DCHECK(aura::Env::GetInstanceDontCreate());
@@ skipping 90 matching lines @@
   video_detector_.reset();
   high_contrast_controller_.reset();
 
   shadow_controller_.reset();
   resize_shadow_controller_.reset();
 
   // Has to happen before ~MruWindowTracker.
   wm_shell_->DeleteWindowCycleController();
   wm_shell_->DeleteWindowSelectorController();
 
-  // |shelf_window_watcher_| has a weak pointer to |shelf_Model_|
-  // and has window observers.
+  // |shelf_window_watcher_| has a weak pointer to the shelf model and has
+  // window observers.
   shelf_window_watcher_.reset();
 
   // Destroy all child windows including widgets.
   window_tree_host_manager_->CloseChildWindows();
   // MruWindowTracker must be destroyed after all windows have been deleted to
   // avoid a possible crash when Shell is destroyed from a non-normal shutdown
   // path. (crbug.com/485438).
   wm_shell_->DeleteMruWindowTracker();
 
   // Chrome implementation of shelf delegate depends on FocusClient,
   // so must be deleted before |focus_client_| (below).
   shelf_delegate_.reset();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical. TODO(oshima): sort.
   magnification_controller_.reset();
   partial_magnification_controller_.reset();
   tooltip_controller_.reset();
   event_client_.reset();
   toplevel_window_event_handler_.reset();
   visibility_controller_.reset();
-  // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be
-  // destroyed before |shelf_model_| is destroyed.
+  // |shelf_item_delegate_manager_| observes the shelf model.
   shelf_item_delegate_manager_.reset();
-  shelf_model_.reset();
 
   power_button_controller_.reset();
   lock_state_controller_.reset();
 
   screen_pinning_controller_.reset();
 
 #if defined(OS_CHROMEOS)
   resolution_notification_controller_.reset();
 #endif
   desktop_background_controller_.reset();
@@ skipping 415 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash