Use a single views::MenuConfig instance for each platform

ui/views/controls/menu/menu_item_view.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_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 41 matching lines @@
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override {
     // Empty menu items shouldn't have a tooltip.
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
 };
 
+// Helper that returns a reference to the MenuConfig to be used with menus.
+const MenuConfig& GetMenuConfig() {
+  return MenuConfig::instance();

[Evan Stade, 2015/12/07 19:51:42]

inline this instead of having a helper?

[tapted, 2015/12/08 11:49:23]

Done. I thought it would be a lot of churn, but I tried it out and it's not bad
(net result: a couple more lines removed)

+}
+
 }  // namespace
 
 // Padding between child views.
 static const int kChildXPadding = 8;
 
 // MenuItemView ---------------------------------------------------------------
 
 // static
 const int MenuItemView::kMenuItemViewID = 1001;
 
@@ skipping 161 matching lines @@
     const base::string16& minor_text,
     const gfx::ImageSkia& icon,
     Type type,
     ui::MenuSeparatorType separator_style) {
   DCHECK_NE(type, EMPTY);
   DCHECK_LE(0, index);
   if (!submenu_)
     CreateSubmenu();
   DCHECK_GE(submenu_->child_count(), index);
   if (type == SEPARATOR) {
-    submenu_->AddChildViewAt(new MenuSeparator(this, separator_style), index);
+    submenu_->AddChildViewAt(new MenuSeparator(separator_style), index);
     return NULL;
   }
   MenuItemView* item = new MenuItemView(this, item_id, type);
   if (label.empty() && GetDelegate())
     item->SetTitle(GetDelegate()->GetLabel(item_id));
   else
     item->SetTitle(label);
   item->SetSubtitle(sublabel);
   item->SetMinorText(minor_text);
   if (!icon.isNull())
@@ skipping 306 matching lines @@
   }
 }
 
 void MenuItemView::SetMargins(int top_margin, int bottom_margin) {
   top_margin_ = top_margin;
   bottom_margin_ = bottom_margin;
 
   invalidate_dimensions();
 }
 
-const MenuConfig& MenuItemView::GetMenuConfig() const {
-  return MenuConfig::instance(GetNativeTheme());
-}
-
 MenuItemView::MenuItemView(MenuItemView* parent,
                            int command,
                            MenuItemView::Type type)
     : delegate_(NULL),
       controller_(NULL),
       canceled_(false),
       parent_menu_item_(parent),
       type_(type),
       selected_(false),
       command_(command),
@@ skipping 487 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views