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 9e2ea03b735de67bd69650c9adcc7fc2773802ef..f5dede41e7e4b7a25550c15a5b4da6281376dceb 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "chrome/browser/extensions/extension_toolbar_model.h"
+#include "chrome/browser/ui/views/browser_actions_host_delegate.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"
@@ -105,12 +106,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 BrowserActionsHostDelegate {
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
@@ -131,10 +132,10 @@ class BrowserActionsContainer
   Profile* profile() const { return profile_; }
 
   // Returns the browser this container is associated with.
-  Browser* browser() const { return browser_; }
+  virtual Browser* GetBrowser() const;
 
   // Returns the current tab's ID, or -1 if there is no current tab.
-  int GetCurrentTabId() const;
+  virtual int GetCurrentTabId() const OVERRIDE;
 
   // Get a particular browser action view.
   BrowserActionView* GetBrowserActionViewAt(int index) {
@@ -154,13 +155,15 @@ class BrowserActionsContainer
   void DeleteBrowserActionViews();
 
   // Called when a browser action becomes visible/hidden.
-  void OnBrowserActionVisibilityChanged();
+  virtual void OnBrowserActionVisibilityChanged() OVERRIDE;
+
+  virtual gfx::Size GetContentOffset() const OVERRIDE;
 
   // 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);
+  virtual void OnBrowserActionExecuted(BrowserActionButton* button) OVERRIDE;
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;