Action box menu

chrome/browser/ui/views/browser_action_view.h

Index: chrome/browser/ui/views/browser_action_view.h
diff --git a/chrome/browser/ui/views/browser_action_view.h b/chrome/browser/ui/views/browser_action_view.h
index 570d4d5fd0a4ffda8c3c00b10ef4243baa7a28c9..16d0ce6240b283fae130aafb817a5cc31ef3f3e7 100644
--- a/chrome/browser/ui/views/browser_action_view.h
+++ b/chrome/browser/ui/views/browser_action_view.h
@@ -14,7 +14,7 @@
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
-class BrowserActionsContainer;
+class BrowserActionsHostDelegate;
 class ExtensionAction;
 
 namespace views {
@@ -33,7 +33,7 @@ class BrowserActionButton : public views::MenuButton,
                             public content::NotificationObserver {
  public:
   BrowserActionButton(const extensions::Extension* extension,
-                      BrowserActionsContainer* panel);
+                      BrowserActionsHostDelegate* panel);
 
   // Call this instead of delete.
   void Destroy();
@@ -114,7 +114,7 @@ class BrowserActionButton : public views::MenuButton,
   SkBitmap default_icon_;
 
   // The browser action shelf.
-  BrowserActionsContainer* panel_;
+  BrowserActionsHostDelegate* panel_;

[Aaron Boodman, 2012/06/12 05:53:44]

s/panel_/delegate_/

[yefimt, 2012/06/13 01:24:21]

Done.

 
   // The context menu.  This member is non-NULL only when the menu is shown.
   views::MenuItemView* context_menu_;
@@ -139,7 +139,7 @@ class BrowserActionButton : public views::MenuButton,
 class BrowserActionView : public views::View {
  public:
   BrowserActionView(const extensions::Extension* extension,
-                    BrowserActionsContainer* panel);
+                    BrowserActionsHostDelegate* panel);
   virtual ~BrowserActionView();
 
   BrowserActionButton* button() { return button_; }
@@ -153,13 +153,15 @@ class BrowserActionView : public views::View {
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+
  protected:
   // Overridden from views::View to paint the badge on top of children.
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   // The container for this view.
-  BrowserActionsContainer* panel_;
+  BrowserActionsHostDelegate* panel_;
 
   // The button this view contains.
   BrowserActionButton* button_;