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

ui/views/controls/menu/menu_separator_views.cc

Index: ui/views/controls/menu/menu_separator_views.cc
===================================================================
--- ui/views/controls/menu/menu_separator_views.cc	(revision 160892)
+++ ui/views/controls/menu/menu_separator_views.cc	(working copy)
@@ -8,7 +8,6 @@
 #include "ui/base/native_theme/native_theme.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/menu/menu_config.h"
-#include "ui/views/controls/menu/menu_item_view.h"
 
 namespace {
 
@@ -38,20 +37,19 @@
 }
 
 gfx::Size MenuSeparator::GetPreferredSize() {
-  const MenuConfig& menu_config = parent_menu_item_->GetMenuConfig();
-  int height = menu_config.separator_height;
+  int height = MenuConfig::instance().separator_height;
   switch(type_) {
     case ui::SPACING_SEPARATOR:
-      height = menu_config.separator_spacing_height;
+      height = MenuConfig::instance().separator_spacing_height;
       break;
     case ui::LOWER_SEPARATOR:
-      height = menu_config.separator_lower_height;
+      height = MenuConfig::instance().separator_lower_height;
       break;
     case ui::UPPER_SEPARATOR:
-      height = menu_config.separator_upper_height;
+      height = MenuConfig::instance().separator_upper_height;
       break;
     default:
-      height = menu_config.separator_height;
+      height = MenuConfig::instance().separator_height;
       break;
   }
   return gfx::Size(10,  // Just in case we're the only item in a menu.