Track when fallback icon color is the default.

chrome/browser/android/large_icon_bridge.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 "chrome/browser/android/large_icon_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 12 matching lines @@
 #include "ui/gfx/codec/png_codec.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 
 namespace {
 
-const SkColor kDefaultBackgroundColor = SkColorSetRGB(0x78, 0x78, 0x78);
-
 void OnLargeIconAvailable(
     ScopedJavaGlobalRef<jobject>* j_callback,
     const favicon_base::LargeIconResult& result) {
   JNIEnv* env = AttachCurrentThread();
 
   // Convert the result to a Java Bitmap.
   SkBitmap bitmap;
   ScopedJavaLocalRef<jobject> j_bitmap;
   if (result.bitmap.is_valid()) {
     gfx::PNGCodec::Decode(result.bitmap.bitmap_data->front(),
                           result.bitmap.bitmap_data->size(),
                           &bitmap);
     if (!bitmap.isNull())
       j_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
   }
 
-  jint background_color = kDefaultBackgroundColor;
+  favicon_base::FallbackIconStyle fallback;
   if (result.fallback_icon_style)
-    background_color = result.fallback_icon_style->background_color;
+    fallback = *result.fallback_icon_style;
 
-  Java_LargeIconCallback_onLargeIconAvailable(env, j_callback->obj(), j_bitmap,
-                                              background_color);
+  Java_LargeIconCallback_onLargeIconAvailable(
+      env, j_callback->obj(), j_bitmap, fallback.background_color,
+      fallback.is_default_background_color);
 }
 
 }  // namespace
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return reinterpret_cast<intptr_t>(new LargeIconBridge());
 }
 
 LargeIconBridge::LargeIconBridge() {
 }
@@ skipping 35 matching lines @@
       callback_runner,
       &cancelable_task_tracker_);
 
   return true;
 }
 
 // static
 bool LargeIconBridge::RegisterLargeIconBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }