Add ability to constrain dominant color selection to a HSL range.

chrome/browser/extensions/bookmark_app_helper.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/extensions/bookmark_app_helper.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 92 matching lines @@
   const SkColor kBorderColor = 0xFFD5D5D5;
   const SkColor kBackgroundColor = 0xFFFFFFFF;
 
   // Create a separate canvas for the color strip.
   scoped_ptr<SkCanvas> color_strip_canvas(
       skia::CreateBitmapCanvas(output_size, output_size, false));
   DCHECK(color_strip_canvas);
 
   // Draw a rounded rect of the |base_icon|'s dominant color.
   SkPaint color_strip_paint;
-  color_utils::GridSampler sampler;
   color_strip_paint.setFlags(SkPaint::kAntiAlias_Flag);
-  color_strip_paint.setColor(color_utils::CalculateKMeanColorOfPNG(
-      gfx::Image::CreateFrom1xBitmap(base_icon).As1xPNGBytes(),
-      100,
-      665,
-      &sampler));
+  color_strip_paint.setColor(
+      color_utils::CalculateKMeanColorOfBitmap(base_icon));
   color_strip_canvas->drawRoundRect(SkRect::MakeWH(output_size, output_size),
                                     kBorderRadius,
                                     kBorderRadius,
                                     color_strip_paint);
 
   // Erase the top of the rounded rect to leave a color strip.
   SkPaint clear_paint;
   clear_paint.setColor(SK_ColorTRANSPARENT);
   clear_paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   color_strip_canvas->drawRect(
@@ skipping 217 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidWebExtentSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions