| Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
|
| diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
|
| index 3f60d49c8ab5bae6feb61c5c7a21e6f734cf80db..1b642faddfab0d796c048518f7a48902a6ef7187 100644
|
| --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
|
| +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/shell.h"
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
|
| #include "extensions/common/extension.h"
|
| +#include "ui/app_list/views/app_list_view.h"
|
|
|
| AppListControllerDelegateAsh::AppListControllerDelegateAsh() {}
|
|
|
| @@ -23,6 +24,14 @@ gfx::NativeWindow AppListControllerDelegateAsh::GetAppListWindow() {
|
| return ash::Shell::GetInstance()->GetAppListWindow();
|
| }
|
|
|
| +gfx::Rect AppListControllerDelegateAsh::GetAppListBounds() {
|
| + app_list::AppListView* app_list_view =
|
| + ash::Shell::GetInstance()->GetAppListView();
|
| + if (app_list_view)
|
| + return app_list_view->GetBoundsInScreen();
|
| + return gfx::Rect();
|
| +}
|
| +
|
| gfx::ImageSkia AppListControllerDelegateAsh::GetWindowIcon() {
|
| return gfx::ImageSkia();
|
| }
|
| @@ -46,6 +55,20 @@ AppListControllerDelegate::Pinnable
|
| PIN_FIXED;
|
| }
|
|
|
| +void AppListControllerDelegateAsh::OnShowChildDialog() {
|
| + app_list::AppListView* app_list_view =
|
| + ash::Shell::GetInstance()->GetAppListView();
|
| + if (app_list_view)
|
| + app_list_view->SetAppListOverlayVisible(true);
|
| +}
|
| +
|
| +void AppListControllerDelegateAsh::OnCloseChildDialog() {
|
| + app_list::AppListView* app_list_view =
|
| + ash::Shell::GetInstance()->GetAppListView();
|
| + if (app_list_view)
|
| + app_list_view->SetAppListOverlayVisible(false);
|
| +}
|
| +
|
| bool AppListControllerDelegateAsh::CanDoCreateShortcutsFlow() {
|
| return false;
|
| }
|
|
|