Ash frames: dark frames now use white caption buttons.

chrome/browser/ui/views/frame/browser_header_painter_ash.cc

 // Copyright 2014 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 "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/logging.h"  // DCHECK
 #include "chrome/browser/ui/browser.h"
@@ skipping 388 matching lines @@
         IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P;
   } else {
     hover_background_id =
         IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H;
     pressed_background_id =
         IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P;
   }
   caption_button_container_->SetButtonImages(
       ash::CAPTION_BUTTON_ICON_MINIMIZE,
       IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MINIMIZE,
-      IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MINIMIZE,
       hover_background_id,
       pressed_background_id);
 
   int size_icon_id = 0;
   if (frame_->IsMaximized() || frame_->IsFullscreen())
     size_icon_id = IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORE;
   else
     size_icon_id = IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZE;
   caption_button_container_->SetButtonImages(
       ash::CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
       size_icon_id,
-      size_icon_id,
       hover_background_id,
       pressed_background_id);
 
   caption_button_container_->SetButtonImages(
       ash::CAPTION_BUTTON_ICON_CLOSE,
       IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_CLOSE,
-      IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_CLOSE,
       hover_background_id,
       pressed_background_id);
   caption_button_container_->SetButtonImages(
       ash::CAPTION_BUTTON_ICON_LEFT_SNAPPED,
       IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
-      IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
       hover_background_id,
       pressed_background_id);
   caption_button_container_->SetButtonImages(
       ash::CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
       IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
-      IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
       hover_background_id,
       pressed_background_id);
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {
   return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,
       caption_button_container_, BrowserFrame::GetTitleFontList());
 }