Do not use assets for Ash window control button backgrounds

ash/frame/caption_buttons/frame_caption_button_container_view.cc

 // 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.
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 
 #include <cmath>
 #include <map>
 
 #include "ash/ash_switches.h"
@@ skipping 131 matching lines @@
   AddChildView(close_button_);
 }
 
 FrameCaptionButtonContainerView::~FrameCaptionButtonContainerView() {
 }
 
 void FrameCaptionButtonContainerView::TestApi::EndAnimations() {
   container_view_->maximize_mode_animation_->End();
 }
 
-void FrameCaptionButtonContainerView::SetButtonImages(
-    CaptionButtonIcon icon,
-    int icon_image_id,
-    int hovered_background_image_id,
-    int pressed_background_image_id) {
-  button_icon_id_map_[icon] = ButtonIconIds(icon_image_id,
-                                            hovered_background_image_id,
-                                            pressed_background_image_id);
+void FrameCaptionButtonContainerView::SetButtonImage(CaptionButtonIcon icon,
+                                                     int icon_image_id) {
+  button_icon_id_map_[icon] = icon_image_id;
+
   FrameCaptionButton* buttons[] = {
     minimize_button_, size_button_, close_button_
   };
   for (size_t i = 0; i < arraysize(buttons); ++i) {
     if (buttons[i]->icon() == icon) {
-      buttons[i]->SetImages(icon,
-                            FrameCaptionButton::ANIMATE_NO,
-                            icon_image_id,
-                            hovered_background_image_id,
-                            pressed_background_image_id);
+      buttons[i]->SetImage(icon, FrameCaptionButton::ANIMATE_NO, icon_image_id);
     }
   }
 }
 
 void FrameCaptionButtonContainerView::SetPaintAsActive(bool paint_as_active) {
   minimize_button_->set_paint_as_active(paint_as_active);
   size_button_->set_paint_as_active(paint_as_active);
   close_button_->set_paint_as_active(paint_as_active);
 }
 
@@ skipping 21 matching lines @@
   if (visible) {
     size_button_->SetVisible(true);
     maximize_mode_animation_->SetSlideDuration(kShowAnimationDurationMs);
     maximize_mode_animation_->Show();
   } else {
     maximize_mode_animation_->SetSlideDuration(kHideAnimationDurationMs);
     maximize_mode_animation_->Hide();
   }
 }
 
+void FrameCaptionButtonContainerView::SetButtonSize(const gfx::Size& size) {
+  minimize_button_->set_size(size);
+  size_button_->set_size(size);
+  close_button_->set_size(size);
+}
+
 gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() const {
   int width = 0;
   for (int i = 0; i < child_count(); ++i) {
     const views::View* child = child_at(i);
     if (child->visible())
       width += child_at(i)->GetPreferredSize().width();
   }
+
   return gfx::Size(width, close_button_->GetPreferredSize().height());
 }
 
 void FrameCaptionButtonContainerView::Layout() {
   int x = 0;
   for (int i = 0; i < child_count(); ++i) {
     views::View* child = child_at(i);
     if (!child->visible())
       continue;
 
@@ skipping 64 matching lines @@
   // The early return is dependant on |animate| because callers use
   // SetButtonIcon() with ANIMATE_NO to progress |button|'s crossfade animation
   // to the end.
   if (button->icon() == icon &&
       (animate == ANIMATE_YES || !button->IsAnimatingImageSwap())) {
     return;
   }
 
   FrameCaptionButton::Animate fcb_animate = (animate == ANIMATE_YES) ?
       FrameCaptionButton::ANIMATE_YES : FrameCaptionButton::ANIMATE_NO;
-  std::map<CaptionButtonIcon, ButtonIconIds>::const_iterator it =
+  std::map<CaptionButtonIcon, int>::const_iterator it =
       button_icon_id_map_.find(icon);
-  if (it != button_icon_id_map_.end()) {
-    button->SetImages(icon,
-                      fcb_animate,
-                      it->second.icon_image_id,
-                      it->second.hovered_background_image_id,
-                      it->second.pressed_background_image_id);
-  }
+  if (it != button_icon_id_map_.end())
+    button->SetImage(icon, fcb_animate, it->second);
 }
 
 bool FrameCaptionButtonContainerView::ShouldSizeButtonBeVisible() const {
   return !Shell::GetInstance()->maximize_mode_controller()->
       IsMaximizeModeWindowManagerEnabled() &&
       frame_->widget_delegate()->CanMaximize();
 }
 
 void FrameCaptionButtonContainerView::ButtonPressed(views::Button* sender,
                                                     const ui::Event& event) {
@@ skipping 90 matching lines @@
     FrameCaptionButton* button = buttons[i];
     views::Button::ButtonState new_state = views::Button::STATE_NORMAL;
     if (button == to_hover)
       new_state = views::Button::STATE_HOVERED;
     else if (button == to_press)
       new_state = views::Button::STATE_PRESSED;
     button->SetState(new_state);
   }
 }
 
-FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds()
-    : icon_image_id(-1),
-      hovered_background_image_id(-1),
-      pressed_background_image_id(-1) {
-}
-
-FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds(
-    int icon_id,
-    int hovered_background_id,
-    int pressed_background_id)
-    : icon_image_id(icon_id),
-      hovered_background_image_id(hovered_background_id),
-      pressed_background_image_id(pressed_background_id) {
-}
-
-FrameCaptionButtonContainerView::ButtonIconIds::~ButtonIconIds() {
-}
-
 }  // namespace ash