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

chrome/browser/extensions/webstore_installer.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_WEBSTORE_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_WEBSTORE_INSTALLER_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 29 matching lines @@
     FLAG_INLINE_INSTALL = 1 << 0
   };
 
   class Delegate {
    public:
     virtual void OnExtensionInstallSuccess(const std::string& id) = 0;
     virtual void OnExtensionInstallFailure(const std::string& id,
                                            const std::string& error) = 0;
   };
 
-  // Contains information about what parts of the extension install process can
-  // be skipped or modified. If one of these is present, it means that a CRX
-  // download was initiated by WebstoreInstaller. The Approval instance should
-  // be checked further for additional details.
+  // If added to the WebstoreInstaller, an Approval indicates that the user has
+  // already approved the installation and that the CrxInstaller can bypass its
+  // install prompt.
   struct Approval : public content::DownloadItem::ExternalData {
-    static scoped_ptr<Approval> CreateWithInstallPrompt(Profile* profile);
-    static scoped_ptr<Approval> CreateWithNoInstallPrompt(
-        Profile* profile,
-        const std::string& extension_id,
-        scoped_ptr<base::DictionaryValue> parsed_manifest);
-
+    Approval();
     virtual ~Approval();
 
     // The extension id that was approved for installation.
     std::string extension_id;
 
     // The profile the extension should be installed into.
     Profile* profile;
 
     // The expected manifest, before localization.
     scoped_ptr<base::DictionaryValue> parsed_manifest;
 
     // Whether to use a bubble notification when an app is installed, instead of
     // the default behavior of transitioning to the new tab page.
     bool use_app_installed_bubble;
 
     // Whether to skip the post install UI like the extension installed bubble.
     bool skip_post_install_ui;
-
-    // Whether to skip the install dialog once the extension has been downloaded
-    // and unpacked. One reason this can be true is that in the normal webstore
-    // installation, the dialog is shown earlier, before any download is done,
-    // so there's no need to show it again.
-    bool skip_install_dialog;
-
-   private:
-    Approval();
   };
 
   // Gets the Approval associated with the |download|, or NULL if there's none.
   // Note that the Approval is owned by |download|.
   static const Approval* GetAssociatedApproval(
       const content::DownloadItem& download);
 
   // Creates a WebstoreInstaller for downloading and installing the extension
   // with the given |id| from the Chrome Web Store. If |delegate| is not NULL,
   // it will be notified when the install succeeds or fails. The installer will
@@ skipping 51 matching lines @@
   // The DownloadItem is owned by the DownloadManager and is valid from when
   // OnDownloadStarted is called (with no error) until the DownloadItem
   // transitions to state REMOVING.
   content::DownloadItem* download_item_;
   int flags_;
   scoped_ptr<Approval> approval_;
   GURL download_url_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_WEBSTORE_INSTALLER_H_