Merge 22244 - Try again to land: http://codereview.chromium.org/160483...

chrome/browser/extensions/extensions_service.h

 // Copyright (c) 2009 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_EXTENSIONS_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 71 matching lines @@
                     MessageLoop* frontend_loop,
                     MessageLoop* backend_loop,
                     bool autoupdate_enabled);
   virtual ~ExtensionsService();
 
   // Gets the list of currently installed extensions.
   virtual const ExtensionList* extensions() const {
     return &extensions_;
   }
 
+  const FilePath& install_directory() const { return install_directory_; }
+
   // Initialize and start all installed extensions.
   void Init();
 
   // Install the extension file at |extension_path|.  Will install as an
   // update if an older version is already installed.
   // For fresh installs, this method also causes the extension to be
   // immediately loaded.
+  // TODO(aa): This method can be removed. It is only used by the unit tests,
+  // and they could use CrxInstaller directly instead.
   void InstallExtension(const FilePath& extension_path);
 
-  // XXX Hack: This is a temporary nasty hack to get theme installation working
-  // without a dialog. Will be fixed by making ExtensionsService more modular.
-  void InstallExtension(const FilePath& extension_path,
-                        const GURL& download_url,
-                        const GURL& referrer_url);
-
   // Updates a currently-installed extension with the contents from
   // |extension_path|.
+  // TODO(aa): This method can be removed. ExtensionUpdater could use
+  // CrxInstaller directly instead.
   virtual void UpdateExtension(const std::string& id,
                                const FilePath& extension_path);
 
   // Uninstalls the specified extension. Callers should only call this method
   // with extensions that exist. |external_uninstall| is a magical parameter
   // that is only used to send information to ExtensionPrefs, which external
   // callers should never set to true.
   // TODO(aa): Remove |external_uninstall| -- this information should be passed
   // to ExtensionPrefs some other way.
   void UninstallExtension(const std::string& extension_id,
@@ skipping 66 matching lines @@
 
   // Profile calls this when it is destroyed so that we know not to call it.
   void ProfileDestroyed() { profile_ = NULL; }
 
   ExtensionPrefs* extension_prefs() { return extension_prefs_.get(); }
 
   // Whether the extension service is ready.
   bool is_ready() { return ready_; }
 
  private:
-  // Show a confirm installation infobar on the currently active tab.
-  // TODO(aa): This should be moved up into the UI and attached to the tab it
-  // actually occured in. This requires some modularization of
-  // ExtensionsService.
-  bool ShowThemePreviewInfobar(Extension* extension);
-
   // The profile this ExtensionsService is part of.
   Profile* profile_;
 
   // Preferences for the owning profile.
   scoped_ptr<ExtensionPrefs> extension_prefs_;
 
   // The message loop to use with the backend.
   MessageLoop* backend_loop_;
 
   // The current list of installed extensions.
@@ skipping 129 matching lines @@
 
   // A map of all external extension providers.
   typedef std::map<Extension::Location,
                    linked_ptr<ExternalExtensionProvider> > ProviderMap;
   ProviderMap external_extension_providers_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsServiceBackend);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_