Action box menu

chrome/browser/extensions/extension_toolbar_model.h

Index: chrome/browser/extensions/extension_toolbar_model.h
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index 2c4f27d6224e47e2e1f8badec951284deb527466..09aa2730ff4f58fe76387e903f57e8d5ae76f015 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/browser/extensions/extension_prefs.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -73,24 +74,34 @@ class ExtensionToolbarModel : public content::NotificationObserver {
   bool extensions_initialized() const { return extensions_initialized_; }
 
   size_t size() const {
-    return toolitems_.size();
+    return toolbar_items_.size();
   }
 
   extensions::ExtensionList::iterator begin() {
-    return toolitems_.begin();
+    return toolbar_items_.begin();
   }
 
   extensions::ExtensionList::iterator end() {
-    return toolitems_.end();
+    return toolbar_items_.end();
   }
 
-  const extensions::Extension* GetExtensionByIndex(int index) const;
+  const extensions::Extension* toolbar_item_by_index(int index) const {

[Peter Kasting, 2012/08/03 23:17:42]

Nit: Using size_t for these vector-accessing functions would be more
appropriate.  (The only caller of this is already unsigned anyway.)

[yefimt, 2012/08/07 00:47:06]

Removed

+    return toolbar_items_[index];
+  }
 
   // Utility functions for converting between an index into the list of
   // incognito-enabled browser actions, and the list of all browser actions.
   int IncognitoIndexToOriginal(int incognito_index);
   int OriginalIndexToIncognito(int original_index);
 
+  size_t action_box_extensions_size() {

[Peter Kasting, 2012/08/03 23:17:42]

Nit: You can replace both of these with:

  const extensions::ExtensionList& action_box_menu_items() const {
    return action_box_menu_items_;
  }

This will allow some simplification elsewhere.  See comments in
ActionBoxMenuModel and ActionBoxMenu.

[yefimt, 2012/08/07 00:47:06]

Done.

+    return action_box_menu_items_.size();
+  }
+
+  const extensions::Extension* action_box_menu_item_by_index(int index) const {
+    return action_box_menu_items_[index];
+  }
+
  private:
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
@@ -99,8 +110,15 @@ class ExtensionToolbarModel : public content::NotificationObserver {
 
   // 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 |toolitems_| from these data.
-  void InitializeExtensionList();
+  // and constructs |toolbar_items_| and |action_box_items_| from these data.
+  void InitializeExtensionLists();
+  void PopulateForActionBoxMode();
+  void PopulateForNonActionBoxMode();
+
+  // Fills |list| with extensions based on provided |order|.
+  void FillExtensionList(
+      const extensions::ExtensionPrefs::ExtensionIdSet& order,
+      extensions::ExtensionList* list);
 
   // Save the model to prefs.
   void UpdatePrefs();
@@ -108,8 +126,16 @@ class ExtensionToolbarModel : public content::NotificationObserver {
   // Our observers.
   ObserverList<Observer> observers_;
 
-  void AddExtension(const extensions::Extension* extension);
-  void RemoveExtension(const extensions::Extension* extension);
+  void AddExtension(const extensions::Extension* extension,
+                    extensions::ExtensionList* list);
+  void RemoveExtension(const extensions::Extension* extension,
+                       extensions::ExtensionList* list);
+
+  // Searches for the given |extension| in |toolbar_items_| and
+  // |action_box_menu_items_| and returns pointer to the list with it
+  // or NULL if not found.
+  extensions::ExtensionList* FindListWithExtension(
+      const extensions::Extension* extension);
 
   // Our ExtensionService, guaranteed to outlive us.
   ExtensionService* service_;
@@ -120,7 +146,10 @@ class ExtensionToolbarModel : public content::NotificationObserver {
   bool extensions_initialized_;
 
   // Ordered list of browser action buttons.
-  extensions::ExtensionList toolitems_;
+  extensions::ExtensionList toolbar_items_;
+
+  // List of browser action buttons visible in an action box menu.
+  extensions::ExtensionList action_box_menu_items_;
 
   // Keeps track of what the last extension to get disabled was.
   std::string last_extension_removed_;