Use white header for app windows part #2

ash/wm/panels/panel_frame_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/panels/panel_frame_view.h"
 
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/frame_border_hit_test_controller.h"
 #include "ash/wm/header_painter.h"
 #include "grit/ash_resources.h"
@@ skipping 97 matching lines @@
   if (!header_painter_)
     return HTNOWHERE;
   return FrameBorderHitTestController::NonClientHitTest(this,
       header_painter_.get(), point);
 }
 
 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 {
   if (!header_painter_)
     return bounds();
   return HeaderPainter::GetBoundsForClientView(
       NonClientTopBorderHeight(), bounds());
 }
 
 gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   if (!header_painter_)
     return client_bounds;
   return HeaderPainter::GetWindowBoundsForClientBounds(
       NonClientTopBorderHeight(), client_bounds);
 }
 
 }  // namespace ash