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

chrome/browser/extensions/crx_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/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 68 matching lines @@
       profile_(frontend_weak->profile()),
       client_(client),
       apps_require_extension_mime_type_(false),
       allow_silent_install_(false),
       install_cause_(extension_misc::INSTALL_CAUSE_UNSET),
       creation_flags_(Extension::NO_FLAGS) {
   if (!approval)
     return;
 
   CHECK(profile_->IsSameProfile(approval->profile));
-
   client_->set_use_app_installed_bubble(approval->use_app_installed_bubble);
   client_->set_skip_post_install_ui(approval->skip_post_install_ui);
 
-  // Mark the extension as approved, but save the expected manifest and ID
-  // so we can check that they match the CRX's.
-  approved_ = true;
-  expected_manifest_.reset(approval->parsed_manifest->DeepCopy());
-  expected_id_ = approval->extension_id;
+  if (approval->skip_install_dialog) {
+    // Mark the extension as approved, but save the expected manifest and ID
+    // so we can check that they match the CRX's.
+    approved_ = true;
+    expected_manifest_.reset(approval->parsed_manifest->DeepCopy());
+    expected_id_ = approval->extension_id;
+  }
 }
 
 CrxInstaller::~CrxInstaller() {
   // Delete the temp directory and crx file as necessary. Note that the
   // destructor might be called on any thread, so we post a task to the file
   // thread to make sure the delete happens there. This is a best effort
   // operation since the browser can be shutting down so there might not
   // be a file thread to post to.
   if (!temp_dir_.value().empty()) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
@@ skipping 441 matching lines @@
   // Some users (such as the download shelf) need to know when a
   // CRXInstaller is done.  Listening for the EXTENSION_* events
   // is problematic because they don't know anything about the
   // extension before it is unpacked, so they cannot filter based
   // on the extension.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<CrxInstaller>(this),
       content::Details<const Extension>(extension));
 }