| Index: chrome/browser/android/favicon_helper.cc
|
| diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc
|
| index bfa8416f1ff0282921e0a491e0b1242e9427a76d..247962bc6e06b6d575e4bfc413e75436385c93e7 100644
|
| --- a/chrome/browser/android/favicon_helper.cc
|
| +++ b/chrome/browser/android/favicon_helper.cc
|
| @@ -30,7 +30,6 @@
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/gfx/android/java_bitmap.h"
|
| #include "ui/gfx/codec/png_codec.h"
|
| -#include "ui/gfx/color_analysis.h"
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| #include "ui/gfx/image/image_skia_rep.h"
|
| @@ -185,19 +184,6 @@ void FaviconHelper::EnsureIconIsAvailable(
|
|
|
| FaviconHelper::~FaviconHelper() {}
|
|
|
| -static jint GetDominantColorForBitmap(JNIEnv* env,
|
| - const JavaParamRef<jclass>& clazz,
|
| - const JavaParamRef<jobject>& bitmap) {
|
| - if (!bitmap)
|
| - return 0;
|
| -
|
| - gfx::JavaBitmap bitmap_lock(bitmap);
|
| - SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(bitmap_lock);
|
| - return color_utils::CalculateKMeanColorOfBitmap(skbitmap);
|
| -}
|
| -
|
| -// static
|
| -
|
| // Return the index of |sizes| whose area is largest but not exceeds int type
|
| // range. If all |sizes|'s area exceed int type range, return the first one.
|
| size_t FaviconHelper::GetLargestSizeIndex(const std::vector<gfx::Size>& sizes) {
|
|
|