Revert 160886 - Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuCo…

ui/views/controls/menu/menu_item_view.h

Index: ui/views/controls/menu/menu_item_view.h
===================================================================
--- ui/views/controls/menu/menu_item_view.h	(revision 160892)
+++ ui/views/controls/menu/menu_item_view.h	(working copy)
@@ -14,7 +14,6 @@
 #include "build/build_config.h"
 #include "ui/base/models/menu_separator_types.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/view.h"
 
 #if defined(OS_WIN)
@@ -37,6 +36,7 @@
 class MenuRunnerImpl;
 }
 
+struct MenuConfig;
 class MenuController;
 class MenuDelegate;
 class SubmenuView;
@@ -320,15 +320,6 @@
     use_right_margin_ = use_right_margin;
   }
 
-  // Sets MenuConfig to be used instead of default one.
-  // Setting |menu_config_| to NULL will make menu to use a default MenuConfig.
-  void set_menu_config(const MenuConfig* menu_config) {
-    menu_config_.reset(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);
@@ -509,10 +500,6 @@
   // containing other elements.
   bool use_right_margin_;
 
-  // |menu_config_| to replace default one, could be NULL,
-  // applies to root menu item only.
-  scoped_ptr<const MenuConfig> menu_config_;
-
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };