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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_controller_ash.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/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;
}
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_controller_ash.h ('k') | chrome/browser/ui/cocoa/apps/app_info_dialog_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698