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

ui/views/controls/menu/menu_item_view.h

 // 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 UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #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)
 #include <windows.h>
 
 #include "ui/base/native_theme/native_theme.h"
 #endif
 
 namespace gfx {
 class Font;
 }
 
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
 
 namespace internal {
 class MenuRunnerImpl;
 }
 
+struct MenuConfig;
 class MenuController;
 class MenuDelegate;
 class SubmenuView;
 
 // MenuItemView --------------------------------------------------------------
 
 // MenuItemView represents a single menu item with a label and optional icon.
 // Each MenuItemView may also contain a submenu, which in turn may contain
 // any number of child MenuItemViews.
 //
@@ skipping 263 matching lines @@
 
   // Set top and bottom margins in pixels.  If no margin is set or a
   // negative margin is specified then MenuConfig values are used.
   void SetMargins(int top_margin, int bottom_margin);
 
   // Suppress the right margin if this is set to false.
   void set_use_right_margin(bool use_right_margin) {
     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);
 
   // MenuRunner owns MenuItemView and should be the only one deleting it.
   virtual ~MenuItemView();
 
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
 
   virtual std::string GetClassName() const OVERRIDE;
@@ skipping 160 matching lines @@
   // |menu_position_| is the requested position with respect to the bounds.
   // |actual_menu_position_| is used by the controller to cache the
   // position of the menu being shown.
   MenuPosition requested_menu_position_;
   MenuPosition actual_menu_position_;
 
   // If set to false, the right margin will be removed for menu lines
   // 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);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_