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

Unified Diff: ui/views/widget/widget.cc

Issue 1438513003: [MD] Implement incognito colors as a NativeTheme (for Aura). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win, linux, android compiles issues 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
« ui/native_theme/native_theme_aura_dark.h ('K') | « ui/views/views_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index c3c0252a7f91fe0a645dfa7be4deed08055e4bd7..a770f0f029167ee60d4675e82ea65ceb1997a307 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -766,6 +766,12 @@ ui::ThemeProvider* Widget::GetThemeProvider() const {
}
const ui::NativeTheme* Widget::GetNativeTheme() const {
+ if (ViewsDelegate::GetInstance()) {
+ ui::NativeTheme* theme =
+ ViewsDelegate::GetInstance()->GetNativeThemeOverride(this);
sky 2015/11/12 21:58:29 Can we cache this rather than querying the delegat
Evan Stade 2015/11/12 22:11:11 I suppose we could as long as we call NativeTheme:
+ if (theme)
+ return theme;
+ }
return native_widget_->GetNativeTheme();
}
« ui/native_theme/native_theme_aura_dark.h ('K') | « ui/views/views_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698