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

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

Issue 1166823002: Add a chrome://flag for the App Info dialog on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150603-MacViews-ModalChildConstrained-fromcl
Patch Set: Rebase after typo fix Created 5 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.cc
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
index d9d8ede37e7dfe6d0f40b141b587cac673ed371b..0e9133046426406be2cc237d84576dc82d7a341d 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
@@ -25,6 +25,7 @@
#include "ui/app_list/app_list_folder_item.h"
#include "ui/app_list/app_list_item.h"
#include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_switches.h"
#include "ui/gfx/geometry/rect.h"
#if defined(ENABLE_RLZ)
@@ -86,6 +87,11 @@ bool AppListControllerDelegate::UserMayModifySettings(
}
bool AppListControllerDelegate::CanDoShowAppInfoFlow() {
+#if defined(OS_MACOSX)
+ // Cocoa app list doesn't yet support the app info dialog.
+ if (!app_list::switches::IsMacViewsAppListEnabled())
+ return false;
+#endif
return CanShowAppInfoDialog();
}
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698