diff options
| author | benwells <benwells@chromium.org> | 2015-12-08 18:20:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-09 02:21:38 +0000 |
| commit | 1dd4acd3139eece0998bc422738b4d1b41462fca (patch) | |
| tree | c47ebe6a9af3c1aa9e5f5f9c6f2c898a708cb1ea /chrome/browser/extensions/extension_ui_util.cc | |
| parent | e1858d8614321b276e3588a514262f1553a3c272 (diff) | |
| download | chromium_src-1dd4acd3139eece0998bc422738b4d1b41462fca.zip chromium_src-1dd4acd3139eece0998bc422738b4d1b41462fca.tar.gz chromium_src-1dd4acd3139eece0998bc422738b4d1b41462fca.tar.bz2 | |
Remove all the ephemeral apps code.
BUG=517735
Review URL: https://codereview.chromium.org/1497193002
Cr-Commit-Position: refs/heads/master@{#363918}
Diffstat (limited to 'chrome/browser/extensions/extension_ui_util.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_ui_util.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_ui_util.cc b/chrome/browser/extensions/extension_ui_util.cc index 4cf4fa8..55c72fcb 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 |