Remove ExtensionToolbarModel from ExtensionService.

chrome/browser/extensions/extension_toolbar_model.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_EXTENSION_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/browser/extensions/extension_prefs.h"
+#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Browser;
 class ExtensionService;
 class PrefService;
 
 // Model for the browser actions toolbar.
-class ExtensionToolbarModel : public content::NotificationObserver {
+class ExtensionToolbarModel : public content::NotificationObserver,
+                              public BrowserContextKeyedService   {
  public:
-  explicit ExtensionToolbarModel(ExtensionService* service);
+  ExtensionToolbarModel(Profile* profile,
+                        extensions::ExtensionPrefs* extension_prefs);
   virtual ~ExtensionToolbarModel();
 
   // The action that should be taken as a result of clicking a browser action.
   enum Action {
     ACTION_NONE,
     ACTION_SHOW_POPUP,
     // Unlike LocationBarController there is no ACTION_SHOW_CONTEXT_MENU,
     // because UI implementations tend to handle this themselves at a higher
     // level.
   };
@@ skipping 18 matching lines @@
     // Returns true if a popup was slated to be shown.
     virtual bool BrowserActionShowPopup(const extensions::Extension* extension);
 
     // Called when the model has finished loading.
     virtual void ModelLoaded() {}
 
    protected:
     virtual ~Observer() {}
   };
 
+  // Convenience function to get the ExtensionToolbarModel for a Profile.
+  static ExtensionToolbarModel* Get(Profile* profile);
+
   // Functions called by the view.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
   void MoveBrowserAction(const extensions::Extension* extension, int index);
   // Executes the browser action for an extension and returns the action that
   // the UI should perform in response.
   // |popup_url_out| will be set if the extension should show a popup, with
   // the URL that should be shown, if non-NULL. |should_grant| controls whether
   // the extension should be granted page tab permissions, which is what happens
   // when the user clicks the browser action, but not, for example, when the
@@ skipping 27 matching lines @@
 
  private:
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // To be called after the extension service is ready; gets loaded extensions
   // from the extension service and their saved order from the pref service
   // and constructs |toolbar_items_| from these data.
-  void InitializeExtensionList();
-  void Populate(const extensions::ExtensionIdList& positions);
+  void InitializeExtensionList(ExtensionService* service);
+  void Populate(const extensions::ExtensionIdList& positions,
+                ExtensionService* service);
 
   // Fills |list| with extensions based on provided |order|.
-  void FillExtensionList(const extensions::ExtensionIdList& order);
+  void FillExtensionList(const extensions::ExtensionIdList& order,
+                         ExtensionService* service);
 
   // Save the model to prefs.
   void UpdatePrefs();
 
   // Finds the last known visible position of the icon for an |extension|. The
   // value returned is a zero-based index into the vector of visible items.
   size_t FindNewPositionFromLastKnownGood(
       const extensions::Extension* extension);
 
   // Our observers.
   ObserverList<Observer> observers_;
 
   void AddExtension(const extensions::Extension* extension);
   void RemoveExtension(const extensions::Extension* extension);
   void UninstalledExtension(const extensions::Extension* extension);
 
-  // Our ExtensionService, guaranteed to outlive us.
-  ExtensionService* service_;
+  // The Profile this toolbar model is for.
+  Profile* profile_;
 
+  extensions::ExtensionPrefs* extension_prefs_;
   PrefService* prefs_;
 
   // True if we've handled the initial EXTENSIONS_READY notification.
   bool extensions_initialized_;
 
   // Ordered list of browser action buttons.
   extensions::ExtensionList toolbar_items_;
 
   extensions::ExtensionIdList last_known_positions_;
 
   // The number of icons visible (the rest should be hidden in the overflow
   // chevron).
   int visible_icon_count_;
 
   content::NotificationRegistrar registrar_;
 
   // For observing change of toolbar order preference by external entity (sync).
   PrefChangeRegistrar pref_change_registrar_;
   base::Closure pref_change_callback_;
 
   base::WeakPtrFactory<ExtensionToolbarModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarModel);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_