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 <cctype>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 258 matching lines @@
     if (!domain_and_registry.empty()) {
       icon_letter = domain_and_registry[0];
     } else if (!app_url.host().empty()) {
       icon_letter = app_url.host()[0];
     }
 
     // The color that will be used for the icon's background.
     SkColor background_color = SK_ColorBLACK;
     if (resized_bitmaps.size()) {
       color_utils::GridSampler sampler;
-      background_color = color_utils::CalculateKMeanColorOfPNG(
-          gfx::Image::CreateFrom1xBitmap(resized_bitmaps.begin()->second)
-              .As1xPNGBytes(),
-          100,
-          568,
-          &sampler);
+      background_color = color_utils::CalculateKMeanColorOfBitmap(
+          resized_bitmaps.begin()->second);
     }
 
     for (std::set<int>::const_iterator it = generate_sizes.begin();
          it != generate_sizes.end();
          ++it) {
       GenerateIcon(&resized_bitmaps, *it, background_color, icon_letter);
       // Also generate the 2x resource for this size.
       GenerateIcon(&resized_bitmaps, *it * 2, background_color, icon_letter);
     }
   }
@@ skipping 79 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