Ash frames: dark frames now use white caption buttons.

ash/frame/caption_buttons/frame_caption_button.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_H_
 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
 
 #include "ash/ash_export.h"
 #include "ash/frame/caption_buttons/caption_button_types.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
   FrameCaptionButton(views::ButtonListener* listener, CaptionButtonIcon icon);
   ~FrameCaptionButton() override;
 
   // Sets the images to use to paint the button. If |animate| is ANIMATE_YES,
   // the button crossfades to the new visuals. If the image ids match those
   // currently used by the button and |animate| is ANIMATE_NO the crossfade
   // animation is progressed to the end.
   void SetImages(CaptionButtonIcon icon,
                  Animate animate,
                  int icon_image_id,
-                 int inactive_icon_image_id,
                  int hovered_background_image_id,
                  int pressed_background_image_id);
 
   // Returns true if the button is crossfading to new visuals set in
   // SetImages().
   bool IsAnimatingImageSwap() const;
 
   // Sets the alpha to use for painting. Used to animate visibility changes.
   void SetAlpha(int alpha);
 
@@ skipping 10 matching lines @@
     return icon_;
   }
 
   int icon_image_id() const { return icon_image_id_; }
 
  protected:
   // views::CustomButton override:
   void OnGestureEvent(ui::GestureEvent* event) override;
 
  private:
-  // Returns the icon image to paint based on |paint_as_active_|.
-  const gfx::ImageSkia& GetIconImageToPaint() const;
-
   // Paints |to_center| centered within the button with |alpha|.
   void PaintCentered(gfx::Canvas* canvas,
                      const gfx::ImageSkia& to_center,
                      int alpha);
 
   // The button's current icon.
   CaptionButtonIcon icon_;
 
   // Whether the button should be painted as active.
   bool paint_as_active_;
 
   // Current alpha to use for painting.
   int alpha_;
 
   // The images and image ids used to paint the button.
   int icon_image_id_;
-  int inactive_icon_image_id_;
   int hovered_background_image_id_;
   int pressed_background_image_id_;
   gfx::ImageSkia icon_image_;
-  gfx::ImageSkia inactive_icon_image_;
   gfx::ImageSkia hovered_background_image_;
   gfx::ImageSkia pressed_background_image_;
 
   // The icon image to crossfade from.
   gfx::ImageSkia crossfade_icon_image_;
 
   // Crossfade animation started when the button's images are changed by
   // SetImages().
   scoped_ptr<gfx::SlideAnimation> swap_images_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_