| Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| index 30ca7a247dbd43e18b625bee74aa3f13e57a799c..2e30b2f9884fa379ae50eb1f857944fffb3da277 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "grit/theme_resources.h"
|
| +#include "ui/app_list/app_list_controller.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| @@ -120,10 +121,9 @@ void ChromeShellDelegate::Exit() {
|
| chrome::AttemptUserExit();
|
| }
|
|
|
| -app_list::AppListViewDelegate* ChromeShellDelegate::GetAppListViewDelegate() {
|
| +app_list::AppListController* ChromeShellDelegate::GetAppListController() {
|
| DCHECK(ash::Shell::HasInstance());
|
| - return AppListServiceAsh::GetInstance()->GetViewDelegate(
|
| - Profile::FromBrowserContext(GetActiveBrowserContext()));
|
| + return AppListServiceAsh::GetInstance()->GetAppListController();
|
| }
|
|
|
| ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
|
|
|