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

ui/views/controls/menu/menu_item_view.h

Index: ui/views/controls/menu/menu_item_view.h
diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
index 4f33f10ed3282d01ab927247f86d382b354052b2..6f39dc21d9ec68480619f97112b934d8380e14cc 100644
--- a/ui/views/controls/menu/menu_item_view.h
+++ b/ui/views/controls/menu/menu_item_view.h
@@ -320,6 +320,14 @@ class VIEWS_EXPORT MenuItemView : public View {
     use_right_margin_ = use_right_margin;
   }
 
+  // Sets MenuConfig to be used instead of default one.
+  void set_menu_config(const MenuConfig* menu_config) {
+    menu_config_ = menu_config;
+  }
+
+  // Returns a reference to MenuConfig to be used with this menu.
+  const MenuConfig& GetMenuConfig() const;
+
  protected:
   // Creates a MenuItemView. This is used by the various AddXXX methods.
   MenuItemView(MenuItemView* parent, int command, Type type);
@@ -500,6 +508,10 @@ class VIEWS_EXPORT MenuItemView : public View {
   // containing other elements.
   bool use_right_margin_;
 
+  // |menu_config_| to replace default one, could be NULL,
+  // applies to root menu item only.
+  const MenuConfig* menu_config_;

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

scoped_ptr

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };