| 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 f560d4834a1973ba9a9d6063dbcae711388cec0d..775b9e07bd66f401261d94653af7a5e2bcf0cf4d 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
|
| @@ -24,12 +24,16 @@ gfx::NativeWindow AppListControllerDelegateAsh::GetAppListWindow() {
|
| return ash::Shell::GetInstance()->GetAppListWindow();
|
| }
|
|
|
| -gfx::Rect AppListControllerDelegateAsh::GetAppListBounds() {
|
| +web_modal::ModalDialogHost* AppListControllerDelegateAsh::GetDialogHost() {
|
| app_list::AppListView* app_list_view =
|
| ash::Shell::GetInstance()->GetAppListView();
|
| - if (app_list_view)
|
| - return app_list_view->GetBoundsInScreen();
|
| - return gfx::Rect();
|
| + return app_list_view ? app_list_view->GetDialogHost() : NULL;
|
| +}
|
| +
|
| +gfx::Size AppListControllerDelegateAsh::GetAppListSize() {
|
| + app_list::AppListView* app_list_view =
|
| + ash::Shell::GetInstance()->GetAppListView();
|
| + return app_list_view ? app_list_view->size() : gfx::Size();
|
| }
|
|
|
| gfx::ImageSkia AppListControllerDelegateAsh::GetWindowIcon() {
|
|
|