Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: ui/views/view.cc

Issue 1461923002: Change name of NativeTheme::instance() to make it clear it's web only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NATIVE_THEME_EXPORT for mac Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/view.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 46bb7be9d230e22aa84dff30ff9952cc16e9fbdf..3bced000cacbef07e9ea2d699a7929676ab7887e 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -840,12 +840,12 @@ const ui::NativeTheme* View::GetNativeTheme() const {
return widget->GetNativeTheme();
#if defined(OS_WIN)
- // On Windows, ui::NativeTheme::instance() 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
+ // 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
return ui::NativeThemeWin::instance();
#else
- return ui::NativeTheme::instance();
+ return ui::NativeTheme::GetInstanceForWeb();
#endif
}
« no previous file with comments | « ui/views/view.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698