Refactoring handle and dragging a bit in preparation for moles. The primary change for this is to get rid of the concept of a "current" toolstrip and the idea that there's only one handle around. Instead, each toolstrip has its own handle and each can be displaying it independently. There's some initial work for moles in there, but it's disabled since this will require some other plumbing to hook up properly.

Review URL: http://codereview.chromium.org/155192

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

1 files changed, 8 insertions, 3 deletions

diff --git a/chrome/browser/extensions/extension_shelf_model.h b/chrome/browser/extensions/extension_shelf_model.h
index 7af61f8..ab2af06 100644
--- a/chrome/browser/extensions/extension_shelf_model.h
+++ b/chrome/browser/extensions/extension_shelf_model.h
@@ -67,8 +67,8 @@ class ExtensionShelfModel : public NotificationObserver {
   // Add |toolstrip| to the end of the shelf.
   void AppendToolstrip(ExtensionHost* toolstrip);
 
-  // Insert |toolstrip| at |index|.
-  void InsertToolstripAt(int index, ExtensionHost* toolstrip);
+  // Insert |toolstrip| and |data| at |index|.
+  void InsertToolstripAt(int index, ExtensionHost* toolstrip, void* data);
 
   // Remove the toolstrip at |index|.
   void RemoveToolstripAt(int index);
@@ -82,6 +82,10 @@ class ExtensionShelfModel : public NotificationObserver {
   // Return the toolstrip at |index|.  Returns NULL if index is out of range.
   ExtensionHost* ToolstripAt(int index);
 
+  // Get/Set some arbitrary data associated with a particular toolstrip.
+  void SetToolstripDataAt(int index, void* data);
+  void* ToolstripDataAt(int index);
+
   // NotificationObserver
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -113,7 +117,8 @@ class ExtensionShelfModel : public NotificationObserver {
   NotificationRegistrar registrar_;
 
   // The Toolstrips loaded in this model. The model owns these objects.
-  typedef std::vector<ExtensionHost*> ExtensionToolstrips;
+  typedef std::pair<ExtensionHost*, void*> ToolstripItem;
+  typedef std::vector<ToolstripItem> ExtensionToolstrips;
   ExtensionToolstrips toolstrips_;
 
   // Our observers.