summaryrefslogtreecommitdiffstats
path: root/ash/wm/panels
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/panels')
-rw-r--r--ash/wm/panels/panel_frame_view.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index ee711d7..73d10b4 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_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE;
+ theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
else
- theme_frame_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
+ 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 {