color_utils cleanup:

mash/wm/frame/default_header_painter.cc

 // Copyright 2015 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 "mash/wm/frame/default_header_painter.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "grit/mash_wm_resources.h"
 #include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 22 matching lines @@
 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;
 
 // 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
@@ skipping 207 matching lines @@
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
   gfx::RectF rect(0, painted_height_ * scale - 1, view_->width() * scale, 1);
   SkPaint paint;
   paint.setColor((mode_ == MODE_ACTIVE) ? kHeaderContentSeparatorColor
                                         : kHeaderContentSeparatorInactiveColor);
   canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), paint);
 }
 
 bool DefaultHeaderPainter::ShouldUseLightImages() {
-  int luminance = color_utils::GetLuminanceForColor(
+  return color_utils::IsDark(

[Peter Kasting, 2016/03/04 01:39:26]

See comments in the ash/ version of this file

       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_ICON_MINIMIZE,
       use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_MINIMIZE_WHITE
                        : IDR_MASH_WM_WINDOW_CONTROL_ICON_MINIMIZE,
       IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
       IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
@@ skipping 46 matching lines @@
       left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 bool DefaultHeaderPainter::UsesCustomFrameColors() const {
   return active_frame_color_ != kDefaultFrameColor ||
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
 }  // namespace wm
 }  // namespace mash