Action box menu

chrome/browser/ui/views/location_bar/action_box_button_view.cc

Index: chrome/browser/ui/views/location_bar/action_box_button_view.cc
diff --git a/chrome/browser/ui/views/location_bar/action_box_button_view.cc b/chrome/browser/ui/views/location_bar/action_box_button_view.cc
index b53bd1597e75e9e1fbb04ca9cbfb7a887468e89c..1778b32ac1484b397bfd6c2b98f4d6a57116a626 100644
--- a/chrome/browser/ui/views/location_bar/action_box_button_view.cc
+++ b/chrome/browser/ui/views/location_bar/action_box_button_view.cc
@@ -8,7 +8,12 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
+#include "chrome/browser/ui/views/action_box_menu.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -30,9 +35,12 @@ const SkColor kPushedBorderColor = SkColorSetRGB(191, 191, 191);
 }  // namespace
 
 
-ActionBoxButtonView::ActionBoxButtonView(ExtensionService* extension_service)
+ActionBoxButtonView::ActionBoxButtonView(Profile* profile,
+                                         Delegate* delegate)
     : views::MenuButton(NULL, string16(), this, false),
-      extension_service_(extension_service) {
+      profile_(profile),
+      delegate_(delegate),
+      bookmark_state_(false) {
   set_id(VIEW_ID_ACTION_BOX_BUTTON);
   SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON));
   SetIcon(*ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
@@ -73,5 +81,18 @@ void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) {
 
 void ActionBoxButtonView::OnMenuButtonClicked(View* source,
                                               const gfx::Point& point) {
-  // TODO(yefim): Implement menu here.
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
+  if (!extension_service)
+    return;
+
+  Browser* browser = delegate_->GetBrowser();
+  if (!browser)
+    return;
+
+  ActionBoxMenuModel model(extension_service);
+  action_box_menu_.reset(new ActionBoxMenu(browser, &model, bookmark_state_));

[beaudoin, 2012/07/19 15:33:50]

You're passing a pointer to a short-lived object into the persistent
action_box_menu_ here and the pointer is saved by action_box_menu_. This could
easily lead to a use-after-free.

[yefimt, 2012/07/19 20:00:15]

Menu gets destroyed before model, but it bring a good point, why menu is a class
member. There is need for that, fixed.

+  action_box_menu_->Init();
+  action_box_menu_->RunMenu(this);
+  action_box_menu_.reset();
 }