summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension.cc
diff options
context:
space:
mode:
authortmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 11:12:23 +0000
committertmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 11:12:23 +0000
commit411f8aef7e6db2fadec7205a220f24ec8b914486 (patch)
tree619e67df3f82fa12c572c50cba09ea35fd625896 /extensions/common/extension.cc
parent128a45f650f3a12253c3c2984d0f6eb36ab2a27b (diff)
downloadchromium_src-411f8aef7e6db2fadec7205a220f24ec8b914486.zip
chromium_src-411f8aef7e6db2fadec7205a220f24ec8b914486.tar.gz
chromium_src-411f8aef7e6db2fadec7205a220f24ec8b914486.tar.bz2
Moved IS_EPHEMERAL flag to extension prefs
This patch moves the IS_EPHEMERAL flag from the Extension class to extension prefs. This is because an Extension object is immutable and this flag needs to be changed after creation to quickly promote a running ephemeral app to being installed. Otherwise the install must be delayed until the ephemeral app is closed. BUG=374018 TBR=sky@chromium.org TEST=All automated tests Review URL: https://codereview.chromium.org/282103003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/extension.cc')
-rw-r--r--extensions/common/extension.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 6bb9bd7..46810ad 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -333,12 +333,12 @@ bool Extension::RequiresSortOrdinal() const {
bool Extension::ShouldDisplayInAppLauncher() const {
// Only apps should be displayed in the launcher.
- return is_app() && display_in_launcher_ && !is_ephemeral();
+ return is_app() && display_in_launcher_;
}
bool Extension::ShouldDisplayInNewTabPage() const {
// Only apps should be displayed on the NTP.
- return is_app() && display_in_new_tab_page_ && !is_ephemeral();
+ return is_app() && display_in_new_tab_page_;
}
bool Extension::ShouldDisplayInExtensionSettings() const {