Change name of NativeTheme::instance() to make it clear it's web only.

ui/views/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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 35 matching lines @@
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
+#include "ui/native_theme/native_theme_win.h"
 #endif
 
 namespace views {
 
 namespace {
 
 #if defined(OS_WIN)
 const bool kContextMenuOnMousePress = false;
 #else
 const bool kContextMenuOnMousePress = true;
@@ skipping 757 matching lines @@
 }
 
 void View::set_background(Background* b) {
   background_.reset(b);
 }
 
 void View::SetBorder(scoped_ptr<Border> b) { border_ = b.Pass(); }
 
 ui::ThemeProvider* View::GetThemeProvider() const {
   const Widget* widget = GetWidget();
-  return widget ? widget->GetThemeProvider() : NULL;
+  return widget ? widget->GetThemeProvider() : nullptr;
 }
 
 const ui::NativeTheme* View::GetNativeTheme() const {
+// On Windows, ui::NativeTheme::GetInstanceForWeb() returns NativeThemeWinAura
+// because that's what the renderer wants, but Views should default to
+// NativeThemeWin. TODO(estade): clean this up, see http://crbug.com/558029
+#if defined(OS_WIN)
+  const ui::NativeTheme* default_theme = ui::NativeThemeWin::instance();
+#else
+  const ui::NativeTheme* default_theme = ui::NativeTheme::GetInstanceForWeb();
+#endif
   const Widget* widget = GetWidget();
-  return widget ? widget->GetNativeTheme() : ui::NativeTheme::instance();
+  return widget ? widget->GetNativeTheme() : default_theme;
 }
 
 // RTL painting ----------------------------------------------------------------
 
 void View::EnableCanvasFlippingForRTLUI(bool enable) {
   flip_canvas_on_paint_for_rtl_ui_ = enable;
 }
 
 // Input -----------------------------------------------------------------------
 
@@ skipping 1505 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views