Ash frames: dark frames now use white caption buttons.

ash/frame/caption_buttons/frame_caption_button_container_view.h

 // Copyright 2013 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.
 
 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 
 #include <map>
 
 #include "ash/ash_export.h"
@@ skipping 51 matching lines @@
     FrameCaptionButtonContainerView* container_view_;
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   // Sets the resource ids of the images to paint the button for |icon|. The
   // 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 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();
 
@@ skipping 15 matching lines @@
   // Overridden from gfx::AnimationDelegate:
   void AnimationEnded(const gfx::Animation* animation) override;
   void AnimationProgressed(const gfx::Animation* animation) override;
 
  private:
   friend class FrameCaptionButtonContainerViewTest;
 
   struct ButtonIconIds {
     ButtonIconIds();
     ButtonIconIds(int icon_id,
-                  int inactive_icon_id,
                   int hovered_background_id,
                   int pressed_background_id);
     ~ButtonIconIds();
 
     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
   // will crossfade to the new icon. If |animate| is ANIMATE_NO and
   // |icon| == |button|->icon(), the crossfade animation is progressed to the
   // end.
   void SetButtonIcon(FrameCaptionButton* button,
                      CaptionButtonIcon icon,
@@ skipping 33 matching lines @@
   // Animation that affects the position of |minimize_button_| and the
   // visibility of |size_button_|.
   scoped_ptr<gfx::SlideAnimation> maximize_mode_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_