Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1055)

Unified Diff: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

Issue 719203003: Parent the AppInfoDialog using a ModalDialogHost Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {

Powered by Google App Engine
This is Rietveld 408576698