Reland of AppListController refactoring part 3: Switching over to use AppListShower in Ash.

chrome/browser/ui/ash/chrome_shell_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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include <stddef.h>
 
 #include "ash/content/gpu_support_impl.h"
 #include "ash/session/session_state_delegate.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/grit/chromium_strings.h"
 #include "grit/theme_resources.h"
+#include "ui/app_list/shower/app_list_shower.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 87 matching lines @@
       ProfileManager::GetActiveUserProfile());
   chrome::AddSelectedTabWithURL(displayer.browser(), url,
                                 ui::PAGE_TRANSITION_LINK);
 
   // Since the ScopedTabbedBrowserDisplayer does not guarantee that the
   // browser will be shown on the active desktop, we ensure the visibility.
   multi_user_util::MoveWindowToCurrentDesktop(
       displayer.browser()->window()->GetNativeWindow());
 }
 
-app_list::AppListViewDelegate* ChromeShellDelegate::GetAppListViewDelegate() {
+app_list::AppListShower* ChromeShellDelegate::GetAppListShower() {
   DCHECK(ash::Shell::HasInstance());
-  return AppListServiceAsh::GetInstance()->GetViewDelegate(
-      Profile::FromBrowserContext(GetActiveBrowserContext()));
+  return AppListServiceAsh::GetInstance()->GetAppListShower();
 }
 
 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
     ash::ShelfModel* model) {
   if (!shelf_delegate_) {
     shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
     shelf_delegate_->Init();
   }
   return shelf_delegate_;
 }
@@ skipping 64 matching lines @@
 
 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.AddObserver(observer);
 }
 
 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.RemoveObserver(observer);
 }