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

ui/views/controls/menu/menu_separator_views.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_separator.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #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 {
 
 const int kSeparatorHeight = 1;
 
 }  // namespace
 
 namespace views {
 
 void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
   int pos = 0;
   switch (type_) {
     case ui::LOWER_SEPARATOR:
       pos = height() - kSeparatorHeight;
       break;
     case ui::SPACING_SEPARATOR:
       return;
     case ui::UPPER_SEPARATOR:
       break;
     default:
       pos = height() / 2;
       break;
   }
   canvas->FillRect(gfx::Rect(0, pos, width(), kSeparatorHeight),
       ui::NativeTheme::instance()->GetSystemColor(
             ui::NativeTheme::kColorId_MenuSeparatorColor));
 }
 
 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.
                    height);
 }
 
 }  // namespace views