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

Unified Diff: chrome/browser/ui/app_list/app_list_controller_delegate_views.cc

Issue 276833002: Make the App Info Dialog appear modal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unnecessary mac fixes Created 6 years, 7 months 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/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 2ec4e9b7df47e7f6a001484f2d59b698a048bcdf..03ec889a64ecf2bd7b36f122b458a1d4de6b70e2 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
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/app_list/app_list_controller_delegate_views.h"
#include "chrome/browser/ui/app_list/app_list_service_views.h"
+#include "ui/app_list/views/app_list_view.h"
AppListControllerDelegateViews::AppListControllerDelegateViews(
AppListServiceViews* service)
@@ -14,15 +15,29 @@ AppListControllerDelegateViews::AppListControllerDelegateViews(
AppListControllerDelegateViews::~AppListControllerDelegateViews() {}
+gfx::Rect AppListControllerDelegateViews::GetAppListBounds() {
+ // 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();
+}
+
void AppListControllerDelegateViews::ViewClosing() {
service_->OnViewBeingDestroyed();
}
-void AppListControllerDelegateViews::OnShowExtensionPrompt() {
+void AppListControllerDelegateViews::OnShowChildDialog() {
+ DCHECK(service_->shower().app_list());
+ service_->shower().app_list()->SetAppListOverlayVisible(true);
service_->set_can_dismiss(false);
}
-void AppListControllerDelegateViews::OnCloseExtensionPrompt() {
+void AppListControllerDelegateViews::OnCloseChildDialog() {
+ DCHECK(service_->shower().app_list());
+ service_->shower().app_list()->SetAppListOverlayVisible(false);
service_->set_can_dismiss(true);
}

Powered by Google App Engine
This is Rietveld 408576698