Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it avail…

chrome/browser/ui/views/action_box_menu.cc

Index: chrome/browser/ui/views/action_box_menu.cc
diff --git a/chrome/browser/ui/views/action_box_menu.cc b/chrome/browser/ui/views/action_box_menu.cc
index 7dc1f6f7b43f250893cf8ebf69e90b2a0f835c39..8a1d63bad0b842d5bf7fc73d78d0192630951c00 100644
--- a/chrome/browser/ui/views/action_box_menu.cc
+++ b/chrome/browser/ui/views/action_box_menu.cc
@@ -12,6 +12,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view.h"
 
@@ -21,6 +22,18 @@
 #include "ui/base/native_theme/native_theme_win.h"
 #endif
 
+struct ActionBoxMenuConfig : public views::MenuConfig {

[sky, 2012/10/08 21:32:26]

MenuConfig isn't set up for subclassing for two reasons:
. there's no virtual destructor, so this code leaks.
. The state is set in Create(), not the constructor.

I don't think we need to subclass MenuConfig. Instead create a MenuConfig and
set the values you need to override. In order to do this you need to move
functionality from MenuConfig::Create to the constructor. That will likely
enable you to get rid of all the static methods there now
(Reset/Create/instance).

[yefimt, 2012/10/08 22:32:01]

Done.

+ public:
+  ActionBoxMenuConfig() : menu_config_(NULL) {
+    menu_config_ = Create();
+    CustomizeMenu();
+  }
+  void CustomizeMenu() {
+    // TODO(yefim): add menu customization here.
+  }
+  views::MenuConfig* menu_config_;

[sky, 2012/10/08 21:32:26]

There's no need for this now, right?

[yefimt, 2012/10/08 22:32:01]

Done.

+};
+
 // static
 scoped_ptr<ActionBoxMenu> ActionBoxMenu::Create(
     Browser* browser,
@@ -52,6 +65,11 @@ ActionBoxMenu::ActionBoxMenu(Browser* browser,
       model_(model.Pass()) {
   views::MenuItemView* menu = new views::MenuItemView(this);
   menu->set_has_icons(true);
+  ActionBoxMenuConfig menu_config;
+  // |menu| will own MenuConfig
+  menu->set_menu_config(menu_config.menu_config_);
+  menu_config.menu_config_ = NULL;
+
   menu_runner_.reset(new views::MenuRunner(menu));
 }