Action box menu

chrome/browser/ui/views/browser_actions_container.h

Index: chrome/browser/ui/views/browser_actions_container.h
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index a82625c6847b638a98308ee41375914f731d103f..5ab7a3005e97770e9194e25ba41bf6e1c1687e9a 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include "chrome/browser/extensions/extension_toolbar_model.h"
+#include "chrome/browser/ui/views/browser_action_view.h"
 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "content/public/browser/notification_observer.h"
@@ -104,12 +105,12 @@ class ResizeArea;
 class BrowserActionsContainer
     : public views::View,
       public views::MenuButtonListener,
-      public views::DragController,
       public views::ResizeAreaDelegate,
       public ui::AnimationDelegate,
       public ExtensionToolbarModel::Observer,
       public BrowserActionOverflowMenuController::Observer,
-      public views::Widget::Observer {
+      public views::Widget::Observer,
+      public BrowserActionView::Delegate {
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
@@ -129,12 +130,6 @@ class BrowserActionsContainer
   // Returns the profile this container is associated with.
   Profile* profile() const { return profile_; }
 
-  // Returns the browser this container is associated with.
-  Browser* browser() const { return browser_; }
-
-  // Returns the current tab's ID, or -1 if there is no current tab.
-  int GetCurrentTabId() const;
-
   // Get a particular browser action view.
   BrowserActionView* GetBrowserActionViewAt(int index) {
     return browser_action_views_[index];
@@ -152,15 +147,9 @@ class BrowserActionsContainer
   // Delete all browser action views.
   void DeleteBrowserActionViews();
 
-  // Called when a browser action becomes visible/hidden.
-  void OnBrowserActionVisibilityChanged();
-
   // Returns how many browser actions are visible.
   size_t VisibleBrowserActions() const;
 
-  // Called when the user clicks on the browser action icon.
-  void OnBrowserActionExecuted(BrowserActionButton* button);
-
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
@@ -202,6 +191,13 @@ class BrowserActionsContainer
   // Overridden from views::Widget::Observer
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
 
+  // Overridden from BrowserActionView::Delegate:
+  virtual Browser* GetBrowser() const;

[Peter Kasting, 2012/07/21 01:55:13]

This should be removed, as it's no longer overriding anything.

BrowserActionOverflowMenuController can take the Browser as a constructor
argument to avoid reintroducing the browser() accessor on this class.

[yefimt, 2012/07/23 23:47:52]

Done.

+  virtual int GetCurrentTabId() const OVERRIDE;
+  virtual void OnBrowserActionExecuted(BrowserActionButton* button) OVERRIDE;
+  virtual void OnBrowserActionVisibilityChanged() OVERRIDE;
+  virtual gfx::Size GetViewContentOffset() const OVERRIDE;
+
   // Moves a browser action with |id| to |new_index|.
   void MoveBrowserAction(const std::string& extension_id, size_t new_index);