Do not use assets for Ash window control button backgrounds

ash/frame/default_header_painter.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 "ash/frame/default_header_painter.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 13 matching lines @@
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 using views::Widget;
 
 namespace {
 
 // Color for the window title text.
 const SkColor kTitleTextColor = SkColorSetRGB(40, 40, 40);
+
 // Color of the active window header/content separator line.
 const SkColor kHeaderContentSeparatorColor = SkColorSetRGB(150, 150, 152);
+
 // Color of the inactive window header/content separator line.
 const SkColor kHeaderContentSeparatorInactiveColor =
     SkColorSetRGB(180, 180, 182);
+
 // The default color of the frame.
 const SkColor kDefaultFrameColor = SkColorSetRGB(242, 242, 242);
+
 // Duration of crossfade animation for activating and deactivating frame.
 const int kActivationCrossfadeDurationMs = 200;
+
 // Luminance below which to use white caption buttons.
 const int kMaxLuminanceForLightButtons = 125;
 
+// The dimensions of the control buttons used in the header.
+const int kButtonWidth = 32;
+const int kButtonHeight = 33;

[tdanderson, 2015/12/17 18:00:54]

Peter, I'd like to not have these hard-coded here (and in the _unittests files)
but it seems #including layout_constants in ash/ would constitute a layering
violation. Do you have any suggestions other than giving ash its own separate
layout_constants?

[Peter Kasting, 2015/12/17 20:56:08]

I would create a separate set of layout constants in ash/.  That also allows you
to avoid putting Ash-only constants in GetLayoutConstant().

If you need to avoid a naming conflict you could name your new function
GetAshLayoutConstant().  (This suggests to me that the solution to the problem
of "we hoisted all the views-specific layout constants to c/b/ui/" is to divide
the file and call the views-specific thing GetViewsLayoutConstant().)

[tdanderson, 2015/12/18 17:42:53]

Done.

+
 // Tiles an image into an area, rounding the top corners.
 void TileRoundRect(gfx::Canvas* canvas,
                    const SkPaint& paint,
                    const gfx::Rect& bounds,
                    int corner_radius) {
   SkRect rect = gfx::RectToSkRect(bounds);
   const SkScalar corner_radius_scalar = SkIntToScalar(corner_radius);
   SkScalar radii[8] = {
       corner_radius_scalar, corner_radius_scalar,  // top-left
       corner_radius_scalar, corner_radius_scalar,  // top-right
@@ skipping 38 matching lines @@
 void DefaultHeaderPainter::Init(
     views::Widget* frame,
     views::View* header_view,
     FrameCaptionButtonContainerView* caption_button_container) {
   DCHECK(frame);
   DCHECK(header_view);
   DCHECK(caption_button_container);
   frame_ = frame;
   view_ = header_view;
   caption_button_container_ = caption_button_container;
+  caption_button_container_->SetButtonSize(
+      gfx::Size(kButtonWidth, kButtonHeight));

[tdanderson, 2015/12/17 18:00:54]

Peter, WDYT about adding a GetLayoutSize() to the layout_constants interface?

[Peter Kasting, 2015/12/17 20:56:08]

Seems fine to me.

[tdanderson, 2015/12/18 17:42:53]

Acknowledged.

   UpdateAllButtonImages();
 }
 
 int DefaultHeaderPainter::GetMinimumHeaderWidth() const {
   // Ensure we have enough space for the window icon and buttons. We allow
   // the title string to collapse to zero width.
   return GetTitleBounds().x() +
       caption_button_container_->GetMinimumSize().width();
 }
 
@@ skipping 172 matching lines @@
 }
 
 bool DefaultHeaderPainter::ShouldUseLightImages() {
   int luminance = color_utils::GetLuminanceForColor(
       mode_ == MODE_INACTIVE ? inactive_frame_color_ : active_frame_color_);
   return luminance < kMaxLuminanceForLightButtons;
 }
 
 void DefaultHeaderPainter::UpdateAllButtonImages() {
   bool use_light_images = ShouldUseLightImages();
-  caption_button_container_->SetButtonImages(
+  caption_button_container_->SetButtonImage(
       CAPTION_BUTTON_ICON_MINIMIZE,
       use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+                       : IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE);
 
   UpdateSizeButtonImages(use_light_images);
 
-  caption_button_container_->SetButtonImages(
-      CAPTION_BUTTON_ICON_CLOSE,
-      use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_CLOSE,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+  caption_button_container_->SetButtonImage(
+      CAPTION_BUTTON_ICON_CLOSE, use_light_images
+                                     ? IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_WHITE

[tdanderson, 2015/12/17 18:00:54]

Evan, if this CL landed as-is, am I leaving things in a convenient state for you
to (a) vectorize the frame icons and replace the IDR_... IDs with VectorIcon
IDs, and (b) have the icon and hover/pressed background colors change as needed
for incognito?

[Evan Stade, 2015/12/17 21:52:37]

I can't see how this gets us any farther away from that goal, so sure, go ahead.

[tdanderson, 2015/12/18 17:42:53]

Acknowledged.

+                                     : IDR_AURA_WINDOW_CONTROL_ICON_CLOSE);
 
-  caption_button_container_->SetButtonImages(
+  caption_button_container_->SetButtonImage(
       CAPTION_BUTTON_ICON_LEFT_SNAPPED,
       use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+                       : IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED);
 
-  caption_button_container_->SetButtonImages(
+  caption_button_container_->SetButtonImage(
       CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
       use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+                       : IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED);
 }
 
 void DefaultHeaderPainter::UpdateSizeButtonImages(bool use_light_images) {
   int icon_id = 0;
   if (frame_->IsMaximized() || frame_->IsFullscreen()) {
     icon_id = use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_RESTORE_WHITE
                                : IDR_AURA_WINDOW_CONTROL_ICON_RESTORE;
   } else {
     icon_id = use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE_WHITE
                                : IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE;
   }
-  caption_button_container_->SetButtonImages(
-      CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-      icon_id,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+  caption_button_container_->SetButtonImage(
+      CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE, icon_id);
 }
 
 gfx::Rect DefaultHeaderPainter::GetLocalBounds() const {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect DefaultHeaderPainter::GetTitleBounds() const {
   return HeaderPainterUtil::GetTitleBounds(
       left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 bool DefaultHeaderPainter::UsesCustomFrameColors() const {
   return active_frame_color_ != kDefaultFrameColor ||
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
 }  // namespace ash