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

Unified Diff: chrome/browser/extensions/extension_ui_util.cc

Issue 311293002: Ensure ephemeral apps have dock icons on mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use new enum instead of hidden Created 6 years, 6 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
« no previous file with comments | « chrome/browser/extensions/extension_ui_util.h ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_ui_util.cc
diff --git a/chrome/browser/extensions/extension_ui_util.cc b/chrome/browser/extensions/extension_ui_util.cc
index ab8c5ac0a717f94934042b769f01546b40264cef..32b9e80d0964a2d21ad0d57811c3e376356ab1b6 100644
--- a/chrome/browser/extensions/extension_ui_util.cc
+++ b/chrome/browser/extensions/extension_ui_util.cc
@@ -30,9 +30,14 @@ namespace ui_util {
bool ShouldDisplayInAppLauncher(const Extension* extension,
content::BrowserContext* context) {
+ return CanDisplayInAppLauncher(extension, context) &&
+ !util::IsEphemeralApp(extension->id(), context);
+}
+
+bool CanDisplayInAppLauncher(const Extension* extension,
+ content::BrowserContext* context) {
return extension->ShouldDisplayInAppLauncher() &&
- !IsBlockedByPolicy(extension, context) &&
- !util::IsEphemeralApp(extension->id(), context);
+ !IsBlockedByPolicy(extension, context);
}
bool ShouldDisplayInNewTabPage(const Extension* extension,
« no previous file with comments | « chrome/browser/extensions/extension_ui_util.h ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698