| Index: chrome/browser/ui/app_list/app_list_controller_delegate_views.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_views.cc b/chrome/browser/ui/app_list/app_list_controller_delegate_views.cc
|
| index 03ec889a64ecf2bd7b36f122b458a1d4de6b70e2..c0b5ff555a20b612898e75a49e87395016725955 100644
|
| --- a/chrome/browser/ui/app_list/app_list_controller_delegate_views.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_controller_delegate_views.cc
|
| @@ -15,14 +15,17 @@ AppListControllerDelegateViews::AppListControllerDelegateViews(
|
|
|
| AppListControllerDelegateViews::~AppListControllerDelegateViews() {}
|
|
|
| -gfx::Rect AppListControllerDelegateViews::GetAppListBounds() {
|
| +web_modal::ModalDialogHost* AppListControllerDelegateViews::GetDialogHost() {
|
| + app_list::AppListView* app_list_view = service_->shower().app_list();
|
| + return app_list_view ? app_list_view->GetDialogHost() : NULL;
|
| +}
|
| +
|
| +gfx::Size AppListControllerDelegateViews::GetAppListSize() {
|
| // We use the bounds of the app list view here because the bounds of the app
|
| // list window include the shadow behind it (and the shadow size varies across
|
| // platforms).
|
| app_list::AppListView* app_list_view = service_->shower().app_list();
|
| - if (app_list_view)
|
| - return app_list_view->GetBoundsInScreen();
|
| - return gfx::Rect();
|
| + return app_list_view ? app_list_view->size() : gfx::Size();
|
| }
|
|
|
| void AppListControllerDelegateViews::ViewClosing() {
|
|
|