wip: Refactoring Ash's AppListController, moving the bulk of the logic to chrome/browser/ui/ash/app…

chrome/browser/ui/ash/app_list/app_list_controller_ash.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 "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 
 #include "ash/metrics/task_switch_metrics_recorder.h"
 #include "ash/shell.h"
+#include "chrome/browser/ui/ash/app_list/app_list_shower_ash.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "extensions/common/extension.h"
 #include "ui/app_list/views/app_list_view.h"
 
-AppListControllerDelegateAsh::AppListControllerDelegateAsh() {}
+AppListControllerDelegateAsh::AppListControllerDelegateAsh(
+    AppListShowerAsh* app_list_shower)
+    : app_list_shower_(app_list_shower) {}
 
 AppListControllerDelegateAsh::~AppListControllerDelegateAsh() {}
 
 void AppListControllerDelegateAsh::DismissView() {
   DCHECK(ash::Shell::HasInstance());
   ash::Shell::GetInstance()->DismissAppList();

[xiyuan, 2016/03/11 18:36:00]

Call app_list_shower_->Dismiss(). It looks like we could get rid of Shell
reference in this file.

[mfomitchev, 2016/03/24 17:47:29]

Done. Shell is still used in one place unfortunately to access metrics
(task_switch_metrics_recorder).

 }
 
 gfx::NativeWindow AppListControllerDelegateAsh::GetAppListWindow() {
-  DCHECK(ash::Shell::HasInstance());
-  return ash::Shell::GetInstance()->GetAppListWindow();
+  return app_list_shower_->GetWindow();
 }
 
 gfx::Rect AppListControllerDelegateAsh::GetAppListBounds() {
-  app_list::AppListView* app_list_view =
-      ash::Shell::GetInstance()->GetAppListView();
+  app_list::AppListView* app_list_view = app_list_shower_->GetView();
   if (app_list_view)
     return app_list_view->GetBoundsInScreen();
   return gfx::Rect();
 }
 
 gfx::ImageSkia AppListControllerDelegateAsh::GetWindowIcon() {
   return gfx::ImageSkia();
 }
 
 bool AppListControllerDelegateAsh::IsAppPinned(
@@ skipping 10 matching lines @@
 }
 
 AppListControllerDelegate::Pinnable AppListControllerDelegateAsh::GetPinnable(
     const std::string& extension_id) {
   return ChromeLauncherController::instance()->CanPin(extension_id)
              ? PIN_EDITABLE
              : PIN_FIXED;
 }
 
 void AppListControllerDelegateAsh::OnShowChildDialog() {
-  app_list::AppListView* app_list_view =
-      ash::Shell::GetInstance()->GetAppListView();
+  app_list::AppListView* app_list_view = app_list_shower_->GetView();
   if (app_list_view)
     app_list_view->SetAppListOverlayVisible(true);
 }
 
 void AppListControllerDelegateAsh::OnCloseChildDialog() {
-  app_list::AppListView* app_list_view =
-      ash::Shell::GetInstance()->GetAppListView();
+  app_list::AppListView* app_list_view = app_list_shower_->GetView();
   if (app_list_view)
     app_list_view->SetAppListOverlayVisible(false);
 }
 
 bool AppListControllerDelegateAsh::CanDoCreateShortcutsFlow() {
   return false;
 }
 
 void AppListControllerDelegateAsh::DoCreateShortcutsFlow(
     Profile* profile,
@@ skipping 69 matching lines @@
     AppListSource source) {
   switch (source) {
     case LAUNCH_FROM_APP_LIST:
       return ash::LAUNCH_FROM_APP_LIST;
     case LAUNCH_FROM_APP_LIST_SEARCH:
       return ash::LAUNCH_FROM_APP_LIST_SEARCH;
     default:
       return ash::LAUNCH_FROM_UNKNOWN;
   }
 }