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

Unified Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.cc

Issue 2541873004: Change default frame colors. Change custom titlebar colors on Windows. (Closed)
Patch Set: final osx behavior Created 4 years 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 | « chrome/browser/themes/theme_service_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/glass_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
index b024d1509878e1be274e1e5baa5b780d0e6a3621..0fbe791f84e2f2bc5dc0cc7c53a08945c3c08bda 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
@@ -555,7 +555,10 @@ bool GlassBrowserFrameView::ShowSystemIcon() const {
}
SkColor GlassBrowserFrameView::GetTitlebarColor() const {
- return GetThemeProvider()->GetColor(ThemeProperties::COLOR_FRAME);
+ const ui::ThemeProvider* tp = GetThemeProvider();
+ return ShouldPaintAsActive()
+ ? tp->GetColor(ThemeProperties::COLOR_FRAME)
+ : tp->GetColor(ThemeProperties::COLOR_FRAME_INACTIVE);
}
Windows10CaptionButton* GlassBrowserFrameView::CreateCaptionButton(
« no previous file with comments | « chrome/browser/themes/theme_service_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698