Revert of Use a single views::MenuConfig instance for each platform

ui/views/controls/menu/menu_config_win.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_config.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
 #include "base/logging.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_win.h"
 
 using ui::NativeTheme;
 using ui::NativeThemeWin;
 
 namespace views {
 
-void MenuConfig::Init() {
+void MenuConfig::Init(const NativeTheme* theme) {
+  if (theme == ui::NativeThemeAura::instance()) {
+    InitAura(theme);
+    return;
+  }
+
   arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
 
   NONCLIENTMETRICS_XP metrics;
   base::win::GetNonClientMetrics(&metrics);
   l10n_util::AdjustUIFont(&(metrics.lfMenuFont));
   {
     base::win::ScopedHFONT new_font(CreateFontIndirect(&metrics.lfMenuFont));
     DLOG_ASSERT(new_font.Get());
     font_list = gfx::FontList(gfx::Font(new_font));
   }
@@ skipping 31 matching lines @@
   show_mnemonics =
       (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) &&
        show_cues == TRUE);
 
   SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &show_delay, 0);
 
   separator_upper_height = 5;
   separator_lower_height = 7;
 }
 
+// static
+const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
+  // NOTE: |theme| may be NULL if used before the menu is running.
+  if (!theme || theme == NativeThemeWin::instance()) {
+    static MenuConfig* win_instance = NULL;
+    if (!win_instance)
+      win_instance = new MenuConfig(NativeThemeWin::instance());
+    return *win_instance;
+  }
+  static MenuConfig* views_instance = NULL;
+  if (!views_instance)
+    views_instance = new MenuConfig(theme);
+  return *views_instance;
+}
+
 }  // namespace views