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

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

Issue 1497193002: Remove all the ephemeral apps code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self review, Devlin review. Created 5 years 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_sync_service.cc ('k') | chrome/browser/extensions/extension_util.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 4cf4fa89775566d31d8bf15def03738d868f8219..55c72fcb3b808c1a7212ef22e37631ca9d60e351 100644
--- a/chrome/browser/extensions/extension_ui_util.cc
+++ b/chrome/browser/extensions/extension_ui_util.cc
@@ -31,8 +31,7 @@ namespace ui_util {
bool ShouldDisplayInAppLauncher(const Extension* extension,
content::BrowserContext* context) {
- return CanDisplayInAppLauncher(extension, context) &&
- !util::IsEphemeralApp(extension->id(), context);
+ return CanDisplayInAppLauncher(extension, context);
}
bool CanDisplayInAppLauncher(const Extension* extension,
@@ -44,20 +43,17 @@ bool CanDisplayInAppLauncher(const Extension* extension,
bool ShouldDisplayInNewTabPage(const Extension* extension,
content::BrowserContext* context) {
return extension->ShouldDisplayInNewTabPage() &&
- !IsBlockedByPolicy(extension, context) &&
- !util::IsEphemeralApp(extension->id(), context);
+ !IsBlockedByPolicy(extension, context);
}
bool ShouldDisplayInExtensionSettings(const Extension* extension,
content::BrowserContext* context) {
- return extension->ShouldDisplayInExtensionSettings() &&
- !util::IsEphemeralApp(extension->id(), context);
+ return extension->ShouldDisplayInExtensionSettings();
}
bool ShouldNotBeVisible(const Extension* extension,
content::BrowserContext* context) {
- return extension->ShouldNotBeVisible() ||
- util::IsEphemeralApp(extension->id(), context);
+ return extension->ShouldNotBeVisible();
}
} // namespace ui_util
« no previous file with comments | « chrome/browser/extensions/extension_sync_service.cc ('k') | chrome/browser/extensions/extension_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698