Use white header for app windows part #2

ash/wm/panels/panel_frame_view.cc

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 ee711d7e2c40df4d369f25ee9346e15099e8054f..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_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 {