Action box menu

chrome/browser/ui/views/action_box_menu.h

Index: chrome/browser/ui/views/action_box_menu.h
diff --git a/chrome/browser/ui/views/action_box_menu.h b/chrome/browser/ui/views/action_box_menu.h
new file mode 100644
index 0000000000000000000000000000000000000000..d5a50d6d3d906034f6b5c713060ac68180bb1a92
--- /dev/null
+++ b/chrome/browser/ui/views/action_box_menu.h
@@ -0,0 +1,94 @@
+// Copyright (c) 2012 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_ACTION_BOX_MENU_H_
+#define CHROME_BROWSER_UI_VIEWS_ACTION_BOX_MENU_H_
+
+#include <map>
+
+#include "base/memory/linked_ptr.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/views/browser_action_view.h"
+#include "content/public/browser/notification_observer.h"
+#include "ui/base/models/menu_model.h"
+#include "ui/views/controls/menu/menu_delegate.h"
+
+class ActionBoxMenuModel;
+
+namespace views {
+class Background;
+class Border;
+class MenuItemView;
+class MenuRunner;
+class View;
+}
+
+// ActionBoxMenu adapts the ActionBoxMenuModel to view's menu related classes.
+class ActionBoxMenu : public views::MenuDelegate,
+                      public BrowserActionView::Delegate,
+                      public content::NotificationObserver {
+ public:
+  ActionBoxMenu(Browser* browser,
+                ActionBoxMenuModel* model,
+                bool bookmark_item_state);
+  virtual ~ActionBoxMenu();
+
+  void Init();
+
+  // Shows the menu relative to the specified button.
+  void RunMenu(views::MenuButton* menu_button);
+
+ private:
+  // MenuDelegate overrides:
+  virtual void ExecuteCommand(int id) OVERRIDE;
+  virtual views::Border* CreateMenuBorder() OVERRIDE;
+  virtual views::Background* CreateMenuBackground() OVERRIDE;
+
+  // BrowserActionsHostDelegate overrides:

[Peter Kasting, 2012/07/18 01:37:25]

Nit: Is this supposed to refer to BroweserActionView::Delegate?

[yefimt, 2012/07/18 23:18:13]

Done.

+  virtual Browser* GetBrowser() const OVERRIDE;
+  virtual int GetCurrentTabId() const OVERRIDE;
+  virtual void OnBrowserActionExecuted(BrowserActionButton* button) OVERRIDE;
+  virtual void OnBrowserActionVisibilityChanged() OVERRIDE;
+  virtual gfx::Size GetViewContentOffset() const OVERRIDE;
+
+  // DragController overrides:

[Peter Kasting, 2012/07/18 01:37:25]

Nit: Lump these with the delegate overrides above (I would probably list these
first, actually) as this class doesn't directly inherit from DragController.

[yefimt, 2012/07/18 23:18:13]

Done.

+  virtual void WriteDragDataForView(views::View* sender,
+                                    const gfx::Point& press_pt,
+                                    ui::OSExchangeData* data) OVERRIDE;
+  virtual int GetDragOperationsForView(views::View* sender,
+                                       const gfx::Point& p) OVERRIDE;
+  virtual bool CanStartDragForView(views::View* sender,
+                                   const gfx::Point& press_pt,
+                                   const gfx::Point& p) OVERRIDE;
+
+  // NotificationObserver overrides:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+  views::MenuItemView* AddBookmarkMenuItem(views::MenuItemView* parent,

[Peter Kasting, 2012/07/18 01:37:25]

Nit: Comment this, in particular what happens to the args

[yefimt, 2012/07/18 23:18:13]

Done.

+                                           int* next_id);
+
+  // Populates |parent| with all the child menus in |model|.
+  void PopulateMenu();
+
+  Browser* browser_;
+
+  // The views menu. Owned by |menu_runner_|.
+  views::MenuItemView* root_;
+
+  scoped_ptr<views::MenuRunner> menu_runner_;
+
+  // The model that tracks the order of the toolbar icons.
+  ActionBoxMenuModel* model_;
+
+  bool bookmark_item_state_;
+
+  typedef std::vector<linked_ptr<BrowserActionView> > BrowserActionViews;

[Peter Kasting, 2012/07/18 01:37:25]

As noted, this should be converted to ScopedVector; http://crbug.com/137767 is
now on file to eliminate most or all linked_ptr<> usage in the codebase.

[yefimt, 2012/07/18 23:18:13]

Done.

+  BrowserActionViews browser_action_views_;
+
+  DISALLOW_COPY_AND_ASSIGN(ActionBoxMenu);
+};
+
+#endif  // CHROME_BROWSER_UI_VIEWS_ACTION_BOX_MENU_H_