Do not use assets for Ash window control button backgrounds

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/ash_layout_constants.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"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/ash_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 214 matching lines @@
     PaintTitleBar(canvas);
   }
 }
 
 void BrowserHeaderPainterAsh::LayoutHeader() {
   // Purposefully set |painted_height_| to an invalid value. We cannot use
   // |painted_height_| because the computation of |painted_height_| may depend
   // on having laid out the window controls.
   painted_height_ = -1;
 
-  UpdateCaptionButtonImages();
+  UpdateCaptionButtons();
   caption_button_container_->Layout();
 
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
       view_->width() - caption_button_container_size.width(),
       0,
       caption_button_container_size.width(),
       caption_button_container_size.height());
 
@@ skipping 140 matching lines @@
   // in order to get the default non-themed assets.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (mode == MODE_ACTIVE) {
     return *rb.GetImageSkiaNamed(is_incognito_ ?
         IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME);
   }
   return *rb.GetImageSkiaNamed(is_incognito_ ?
       IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE);
 }
 
-void BrowserHeaderPainterAsh::UpdateCaptionButtonImages() {
-  int hover_background_id = 0;
-  int pressed_background_id = 0;
-  if (frame_->IsMaximized() || frame_->IsFullscreen()) {
-    hover_background_id =
-        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H;
-    pressed_background_id =
-        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(
+void BrowserHeaderPainterAsh::UpdateCaptionButtons() {
+  caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_MINIMIZE,
-      IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE,
-      hover_background_id,
-      pressed_background_id);
+      IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE);
 
   int size_icon_id = 0;
-  if (frame_->IsMaximized() || frame_->IsFullscreen())
+  gfx::Size button_size;
+  if (frame_->IsMaximized() || frame_->IsFullscreen()) {
     size_icon_id = IDR_AURA_WINDOW_CONTROL_ICON_RESTORE;
-  else
+    button_size = GetAshLayoutSize(BROWSER_MAXIMIZED_HEADER_BUTTON);
+  } else {
     size_icon_id = IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE;
-  caption_button_container_->SetButtonImages(
+    button_size = GetAshLayoutSize(BROWSER_RESTORED_HEADER_BUTTON);
+  }

[Peter Kasting, 2015/12/18 18:59:15]

Nit: Shorter:

  int size_icon_id = IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE;
  gfx::Size button_size(GetAshLayoutSize(BROWSER_RESTORED_HEADER_BUTTON));
  if (frame_->IsMaximized() || frame_->IsFullscreen()) {
    size_icon_id = IDR_AURA_WINDOW_CONTROL_ICON_RESTORE;
    button_size = GetAshLayoutSize(BROWSER_MAXIMIZED_HEADER_BUTTON);
  }

[tdanderson, 2016/01/04 23:11:15]

Done.

+  caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-      size_icon_id,
-      hover_background_id,
-      pressed_background_id);
+      size_icon_id);
+  caption_button_container_->SetButtonSize(button_size);

[Peter Kasting, 2015/12/18 18:59:15]

Nit: I'd put this call either above or below all the SetButtonImage() calls.

[tdanderson, 2016/01/04 23:11:15]

Done.

 
-  caption_button_container_->SetButtonImages(
+  caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_CLOSE,
-      IDR_AURA_WINDOW_CONTROL_ICON_CLOSE,
-      hover_background_id,
-      pressed_background_id);
-  caption_button_container_->SetButtonImages(
+      IDR_AURA_WINDOW_CONTROL_ICON_CLOSE);
+  caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-      IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
-      hover_background_id,
-      pressed_background_id);
-  caption_button_container_->SetButtonImages(
+      IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED);
+  caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-      IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
-      hover_background_id,
-      pressed_background_id);
+      IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED);
 }
 
 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());
 }