Add infrastructure for Chrome Actions

chrome/browser/ui/views/toolbar/browser_actions_container.h

 // Copyright 2013 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_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
@@ skipping 123 matching lines @@
   static const int kItemSpacing;
 
   // Constructs a BrowserActionContainer for a particular |browser| object. For
   // documentation of |main_container|, see class comments.
   BrowserActionsContainer(Browser* browser,
                           BrowserActionsContainer* main_container);
   virtual ~BrowserActionsContainer();
 
   void Init();
 
-  // Get the number of browser actions being displayed.
+  // Get the number of actions being displayed.
   size_t num_browser_actions() const { return browser_action_views_.size(); }
+  size_t num_chrome_actions() const { return chrome_action_views_.size(); }
 
   // Whether we are performing resize animation on the container.
   bool animating() const { return animation_target_size_ > 0; }
 
   // Returns the chevron, if any.
   views::View* chevron() { return chevron_; }
   const views::View* chevron() const { return chevron_; }
 
   // Returns the profile this container is associated with.
   Profile* profile() const { return profile_; }
 
   // The class that registers for keyboard shortcuts for extension commands.
   extensions::ExtensionKeybindingRegistry* extension_keybinding_registry() {
     return extension_keybinding_registry_.get();
   }
 
   // Get a particular browser action view.
   BrowserActionView* GetBrowserActionViewAt(int index) {
     return browser_action_views_[index];
   }
 
+  // Get a particular chrome action view.
+  BrowserActionView* GetChromeActionViewAt(size_t index) {
+    return chrome_action_views_[index];
+  }
+
+  // Returns the extension of the view of the given |index|.
+  const extensions::Extension* GetExtensionAt(size_t index) const;
+
   // Returns the BrowserActionView* associated with the given |extension|, or
   // NULL if none exists.
   BrowserActionView* GetViewForExtension(
       const extensions::Extension* extension);
 
-  // Update the views to reflect the state of the browser action icons.
-  void RefreshBrowserActionViews();
+  // Update the views to reflect the current state of the actions.
+  void RefreshActionViews();
 
-  // Sets up the browser action view vector.
-  void CreateBrowserActionViews();
+  // Sets up the browser action views and chrome action views vectors.
+  void CreateActionViews();
 
-  // Delete all browser action views.
-  void DeleteBrowserActionViews();
+  // Delete all action views.
+  void DeleteActionViews();
 
   // Returns how many browser actions are currently visible. If the intent is
   // to find how many are visible once the container finishes animation, see
   // VisibleBrowserActionsAfterAnimation() below.
   size_t VisibleBrowserActions() const;
 
   // Returns how many browser actions will be visible once the container
   // finishes animating to a new size, or (if not animating) the currently
   // visible icons.
   size_t VisibleBrowserActionsAfterAnimation() const;
@@ skipping 41 matching lines @@
   virtual void AnimationProgressed(const gfx::Animation* animation) override;
   virtual void AnimationEnded(const gfx::Animation* animation) override;
 
   // Overridden from BrowserActionView::Delegate:
   virtual content::WebContents* GetCurrentWebContents() override;
   virtual bool ShownInsideMenu() const override;
   virtual void OnBrowserActionViewDragDone() override;
   virtual views::MenuButton* GetOverflowReferenceView() override;
   virtual void SetPopupOwner(BrowserActionView* popup_owner) override;
   virtual void HideActivePopup() override;
-  virtual BrowserActionView* GetMainViewForExtension(
-      const extensions::Extension* extension) override;
+  virtual BrowserActionView* GetMainViewForAction(
+      BrowserActionView* view) override;
 
   // Overridden from extension::ExtensionKeybindingRegistry::Delegate:
   virtual extensions::ActiveTabPermissionGranter*
       GetActiveTabPermissionGranter() override;
 
   // Retrieve the current popup.  This should only be used by unit tests.
   ExtensionPopup* TestGetPopup();
 
   // Returns the width of an icon, optionally with its padding.
   static int IconWidth(bool include_padding);
@@ skipping 80 matching lines @@
   bool in_overflow_mode() const { return main_container_ != NULL; }
 
   // Whether or not the container has been initialized.
   bool initialized_;
 
   // The vector of browser actions (icons/image buttons for each action). Note
   // that not every BrowserAction in the ToolbarModel will necessarily be in
   // this collection. Some extensions may be disabled in incognito windows.
   BrowserActionViews browser_action_views_;
 
+  // The collection of views representing chrome actions.
+  BrowserActionViews chrome_action_views_;
+
   Profile* profile_;
 
   // The Browser object the container is associated with.
   Browser* browser_;
 
   // The main container we are serving as overflow for, or NULL if this
   // class is the the main container. See class comments for details on
   // the difference between main and overflow.
   BrowserActionsContainer* main_container_;
 
@@ skipping 42 matching lines @@
   ObserverList<BrowserActionsContainerObserver> observers_;
 
   // The maximum number of icons to show per row when in overflow mode (showing
   // icons in the application menu).
   static int icons_per_overflow_menu_row_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_