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

BUG=55584

Review URL: https://chromiumcodereview.appspot.com/10356052

TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10387167

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137575 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 19 deletions

diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h
index bea6d6d..b1e7b5d 100644
--- a/chrome/browser/extensions/webstore_installer.h
+++ b/chrome/browser/extensions/webstore_installer.h
@@ -47,17 +47,11 @@ class WebstoreInstaller : public content::NotificationObserver,
                                            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.
@@ -75,15 +69,6 @@ class WebstoreInstaller : public content::NotificationObserver,
 
     // 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.