add mole info to toolstrip definition and enable moles

chrome/browser/extensions/extension_shelf_model.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_EXTENSION_SHELF_MODEL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SHELF_MODEL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 38 matching lines @@
 
 // The model representing the toolstrips on an ExtensionShelf.  The order of
 // the toolstrips is common across all of the models for a given Profile,
 // but there are multiple models.  Each model contains the hosts/views which
 // are specific to a Browser.
 class ExtensionShelfModel : public NotificationObserver {
  public:
   ExtensionShelfModel(Browser* browser);
   virtual ~ExtensionShelfModel();
 
+  struct ToolstripItem {
+    ExtensionHost* host;
+    Extension::ToolstripInfo info;
+    void* data;
+  };
+
   // Add and remove observers to changes within this ExtensionShelfModel.
   void AddObserver(ExtensionShelfModelObserver* observer);
   void RemoveObserver(ExtensionShelfModelObserver* observer);
 
   // The number of toolstrips in the model.
   int count() const { return static_cast<int>(toolstrips_.size()); }
   bool empty() const { return toolstrips_.empty(); }
 
   // Add |toolstrip| to the end of the shelf.
-  void AppendToolstrip(ExtensionHost* toolstrip);
+  void AppendToolstrip(const ToolstripItem& toolstrip);
 
   // Insert |toolstrip| and |data| at |index|.
-  void InsertToolstripAt(int index, ExtensionHost* toolstrip, void* data);
+  void InsertToolstripAt(int index, const ToolstripItem& toolstrip);
 
   // Remove the toolstrip at |index|.
   void RemoveToolstripAt(int index);
 
   // Move the toolstrip at |index| to |to_index|.
   void MoveToolstripAt(int index, int to_index);
 
   // Lookup the index of |toolstrip|.  Returns -1 if not present.
   int IndexOfToolstrip(ExtensionHost* toolstrip);

[Matt Perry, 2009/07/24 23:11:11]

IndexOfExtension?

[Erik does not do reviews, 2009/07/26 00:34:46]

No.  An extension can have multiple toolstrips.

[Matt Perry, 2009/07/27 17:41:50]

Then what good is this method?

Actually, after a quick scan through the .cc files, it seems you only ever call
this as IndexOfToolstrip(toolstrip->host).  You probably want it to take a
Toolstrip* instead.

 
-  // Return the toolstrip at |index|.  Returns NULL if index is out of range.
+  // Return the toolstrip at |index|.
   ExtensionHost* ToolstripAt(int index);
 
+  // Return the ToolstripInfo at |index|.
+  Extension::ToolstripInfo* ToolstripInfoAt(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,
                        const NotificationDetails& details);
 
  private:
@@ skipping 15 matching lines @@
   // The browser that this model is attached to.
   Browser* browser_;
 
   // The preferences that this model uses.
   ExtensionPrefs* prefs_;
 
   // Manages our notification registrations.
   NotificationRegistrar registrar_;
 
   // The Toolstrips loaded in this model. The model owns these objects.
-  typedef std::pair<ExtensionHost*, void*> ToolstripItem;
   typedef std::vector<ToolstripItem> ExtensionToolstrips;
   ExtensionToolstrips toolstrips_;
 
   // Our observers.
   typedef ObserverList<ExtensionShelfModelObserver>
       ExtensionShelfModelObservers;
   ExtensionShelfModelObservers observers_;
 
   // Whether the model has received an EXTENSIONS_READY notification.
   bool ready_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionShelfModel);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SHELF_MODEL_H_