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

Unified Diff: ash/wm/panels/panel_frame_view.cc

Issue 148003003: Use white header for app windows part #2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months 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
Index: ash/wm/panels/panel_frame_view.cc
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index 15ea1d042f3b4aedfeee7b4eb43047c95751f05c..73d10b45c59f4bbe5a19b343aab08cf7a7caf686 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -115,18 +115,19 @@ void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
if (!header_painter_)
return;
bool paint_as_active = ShouldPaintAsActive();
+ caption_button_container_->SetPaintAsActive(paint_as_active);
+
int theme_frame_id = 0;
if (paint_as_active)
theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
else
theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
- header_painter_->PaintHeader(
- canvas,
- theme_frame_id,
- 0);
+ HeaderPainter::Mode header_mode = paint_as_active ?
+ HeaderPainter::MODE_ACTIVE : HeaderPainter::MODE_INACTIVE;
+ header_painter_->PaintHeader(canvas, header_mode, theme_frame_id, 0);
header_painter_->PaintTitleBar(canvas, title_font_list_);
- header_painter_->PaintHeaderContentSeparator(canvas);
+ header_painter_->PaintHeaderContentSeparator(canvas, header_mode);
}
gfx::Rect PanelFrameView::GetBoundsForClientView() const {

Powered by Google App Engine
This is Rietveld 408576698