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

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10399069: Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index f59d8ec04a9da02e30f1c6d4e3e3fac008b3b0c9..7af6b4385623c922c9eb9e216eccf0380d178938 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -308,10 +308,13 @@ void WebIntentPickerController::OnInlineDispositionWebContentsCreated(
void WebIntentPickerController::OnExtensionInstallRequested(
const std::string& id) {
+ scoped_ptr<WebstoreInstaller::Approval> approval(
+ WebstoreInstaller::Approval::CreateWithInstallPrompt(
+ wrapper_->profile()));
+
scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
wrapper_->profile(), this, &wrapper_->web_contents()->GetController(), id,
- scoped_ptr<WebstoreInstaller::Approval>(NULL),
- WebstoreInstaller::FLAG_INLINE_INSTALL);
+ approval.Pass(), WebstoreInstaller::FLAG_INLINE_INSTALL);
pending_async_count_++;
installer->Start();
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698