Use white header for app windows part #2

ash/wm/custom_frame_view_ash.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/custom_frame_view_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/caption_buttons/frame_maximize_button.h"
 #include "ash/wm/caption_buttons/frame_maximize_button_observer.h"
@@ skipping 245 matching lines @@
 int CustomFrameViewAsh::HeaderView::GetMinimumWidth() const {
   return header_painter_->GetMinimumHeaderWidth();
 }
 
 void CustomFrameViewAsh::HeaderView::Layout() {
   header_painter_->LayoutHeader();
   header_painter_->set_header_height(GetPreferredHeight());
 }
 
 void CustomFrameViewAsh::HeaderView::OnPaint(gfx::Canvas* canvas) {
+  bool paint_as_active =
+      frame_->non_client_view()->frame_view()->ShouldPaintAsActive();
+  caption_button_container_->SetPaintAsActive(paint_as_active);
+
   int theme_image_id = 0;
-  if (frame_->IsMaximized() || frame_->IsFullscreen())
-    theme_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED;
-  else if (frame_->non_client_view()->frame_view()->ShouldPaintAsActive())
-    theme_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE;
+  if (paint_as_active)
+    theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
   else
-    theme_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
+    theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
 
+  HeaderPainter::Mode header_mode = paint_as_active ?
+      HeaderPainter::MODE_ACTIVE : HeaderPainter::MODE_INACTIVE;
   header_painter_->PaintHeader(
       canvas,
+      header_mode,
       theme_image_id,
       0);
   header_painter_->PaintTitleBar(canvas, GetTitleFontList());
-  header_painter_->PaintHeaderContentSeparator(canvas);
+  header_painter_->PaintHeaderContentSeparator(canvas, header_mode);
 }
 
 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealStarted() {
   fullscreen_visible_fraction_ = 0;
   SetPaintToLayer(true);
   parent()->Layout();
 }
 
 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealEnded() {
   fullscreen_visible_fraction_ = 0;
@@ skipping 206 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, private:
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash