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

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: 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 76f5a377a878a6d292d9c03806514ce26c4436bd..dad497c9be11cd6de8372064d207f94bb92ddc6f 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -26,6 +26,7 @@
#include "chrome/common/pref_names.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_util.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_icon_set.h"
@@ -641,8 +642,9 @@ void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
extension_ = extension;
permissions_ = extension->GetActivePermissions();
delegate_ = delegate;
- prompt_.set_type(extension->is_ephemeral() ? LAUNCH_PROMPT :
- RE_ENABLE_PROMPT);
+ bool is_ephemeral = extensions::util::IsEphemeralApp(extension->id(),
+ install_ui_->profile());
+ prompt_.set_type(is_ephemeral ? LAUNCH_PROMPT : RE_ENABLE_PROMPT);
LoadImageIfNeeded();
}

Powered by Google App Engine
This is Rietveld 408576698