Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::…

chrome/browser/extensions/webstore_installer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/webstore_installer.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 106 matching lines @@
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file));
 }
 
 }  // namespace
 
 WebstoreInstaller::Approval::Approval()
     : profile(NULL),
       use_app_installed_bubble(false),
-      skip_post_install_ui(false) {
+      skip_post_install_ui(false),
+      skip_install_dialog(false) {
+}
+
+scoped_ptr<WebstoreInstaller::Approval>
+WebstoreInstaller::Approval::CreateWithInstallPrompt(Profile* profile) {
+  scoped_ptr<Approval> result(new Approval());
+  result->profile = profile;
+  return result.Pass();
+}
+
+scoped_ptr<WebstoreInstaller::Approval>
+WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
+    Profile* profile,
+    const std::string& extension_id,
+    scoped_ptr<base::DictionaryValue> parsed_manifest) {
+  scoped_ptr<Approval> result(new Approval());
+  result->extension_id = extension_id;
+  result->profile = profile;
+  result->parsed_manifest = parsed_manifest.Pass();
+  result->skip_install_dialog = true;
+  return result.Pass();
 }
 
 WebstoreInstaller::Approval::~Approval() {}
 
 const WebstoreInstaller::Approval* WebstoreInstaller::GetAssociatedApproval(
     const DownloadItem& download) {
   return static_cast<const Approval*>(download.GetExternalData(kApprovalKey));
 }
 
 WebstoreInstaller::WebstoreInstaller(Profile* profile,
@@ skipping 140 matching lines @@
 }
 
 void WebstoreInstaller::StartDownload(const FilePath& file) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (file.empty()) {
     ReportFailure(kDownloadDirectoryError);
     return;
   }
 
-  // TODO(mihaip): For inline installs, we pretend like the referrer is the
-  // gallery, even though this could be an inline install, in order to pass the
-  // checks in ExtensionService::IsDownloadFromGallery. We should instead pass
-  // the real referrer, track if this is an inline install in the whitelist
-  // entry and look that up when checking that this is a valid download.
-  GURL referrer = controller_->GetActiveEntry()->GetURL();
-  if (flags_ & FLAG_INLINE_INSTALL)
-    referrer = GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + id_);
-
   content::DownloadSaveInfo save_info;
   save_info.file_path = file;
 
   // The download url for the given extension is contained in |download_url_|.
   // We will navigate the current tab to this url to start the download. The
   // download system will then pass the crx to the CrxInstaller.
   download_util::RecordDownloadSource(
       download_util::INITIATED_BY_WEBSTORE_INSTALLER);
   scoped_ptr<DownloadUrlParameters> params(
       DownloadUrlParameters::FromWebContents(
           controller_->GetWebContents(), download_url_, save_info));
-  params->set_referrer(referrer);
+  params->set_referrer(controller_->GetActiveEntry()->GetURL());
   params->set_callback(base::Bind(&WebstoreInstaller::OnDownloadStarted, this));
   profile_->GetDownloadManager()->DownloadUrl(params.Pass());
 }
 
 void WebstoreInstaller::ReportFailure(const std::string& error) {
   if (delegate_) {
     delegate_->OnExtensionInstallFailure(id_, error);
     delegate_ = NULL;
   }
 
   Release();  // Balanced in Start().
 }
 
 void WebstoreInstaller::ReportSuccess() {
   if (delegate_) {
     delegate_->OnExtensionInstallSuccess(id_);
     delegate_ = NULL;
   }
 
   Release();  // Balanced in Start().
 }