win: build fixes

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>
 
@@ skipping 11 matching lines @@
 namespace views {
 
 void MenuConfig::Init(const NativeTheme* theme) {
   if (theme == ui::NativeThemeAura::instance()) {
     InitAura(theme);
     return;
   }
 
   arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
 
-  NONCLIENTMETRICS metrics;
+  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));
   }
   NativeTheme::ExtraParams extra;
   extra.menu_check.is_radio = false;
   extra.menu_check.is_selected = false;
@@ skipping 44 matching lines @@
       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