Use white header for app windows part #2

ash/wm/caption_buttons/frame_caption_button_container_view.h

Index: ash/wm/caption_buttons/frame_caption_button_container_view.h
diff --git a/ash/wm/caption_buttons/frame_caption_button_container_view.h b/ash/wm/caption_buttons/frame_caption_button_container_view.h
index 39497e8a7aed74a98e86769895969b8e591e93a5..29399f8c470c7055ed876b4946c21dd99157f4d8 100644
--- a/ash/wm/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/wm/caption_buttons/frame_caption_button_container_view.h
@@ -7,7 +7,6 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/caption_buttons/alternate_frame_size_button_delegate.h"
-#include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
@@ -75,9 +74,14 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   // FrameCaptionButtonContainerView will keep track of the images to use for
   // |icon| even if none of the buttons currently use |icon|.
   void SetButtonImages(CaptionButtonIcon icon,
-                       int normal_image_id,
-                       int hovered_image_id,
-                       int pressed_image_id);
+                       int icon_image_id,
+                       int inactive_icon_image_id,
+                       int hovered_background_image_id,
+                       int pressed_background_image_id);
+
+  // Sets whether the buttons should be painted as active. Does not schedule
+  // a repaint.
+  void SetPaintAsActive(bool paint_as_active);
 
   // Tell the window controls to reset themselves to the normal state.
   void ResetWindowControls();
@@ -91,19 +95,22 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   friend class FrameCaptionButtonContainerViewTest;
 
   struct ButtonIconIds {
     ButtonIconIds();
-    ButtonIconIds(int normal_id, int hovered_id, int pressed_id);
+    ButtonIconIds(int icon_id,
+                  int inactive_icon_id,
+                  int hovered_background_id,
+                  int pressed_background_id);
     ~ButtonIconIds();
 
-    int normal_image_id;
-    int hovered_image_id;
-    int pressed_image_id;
+    int icon_image_id;
+    int inactive_icon_image_id;
+    int hovered_background_image_id;
+    int pressed_background_image_id;
   };
 
   // Sets |button|'s icon to |icon|. If |animate| is ANIMATE_YES, the button
@@ -133,9 +140,6 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   // The widget that the buttons act on.
   views::Widget* frame_;
 
-  // The close button separator.
-  gfx::ImageSkia button_separator_;
-
   // The buttons. In the normal button style, at most one of |minimize_button_|
   // and |size_button_| is visible.
   FrameCaptionButton* minimize_button_;