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

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

Issue 282103003: Moved IS_EPHEMERAL flag to extension prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix up file header Created 6 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/extensions/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 76cb03dc46eadb6ce2fed57aa08ee4fe311f48ec..b79e904511e7839c9aad55ebe7d6d1aa68e2467f 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -27,6 +27,7 @@
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_util.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_icon_set.h"
@@ -658,7 +659,9 @@ void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
install_ui_->profile() &&
extensions::ExtensionPrefs::Get(install_ui_->profile())->HasDisableReason(
extension->id(), extensions::Extension::DISABLE_REMOTE_INSTALL);
- if (extension->is_ephemeral())
+ bool is_ephemeral =
+ extensions::util::IsEphemeralApp(extension->id(), install_ui_->profile());
+ if (is_ephemeral)
prompt_.set_type(LAUNCH_PROMPT);
else if (is_remote_install)
prompt_.set_type(REMOTE_INSTALL_PROMPT);
« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui.cc ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698