| Index: chrome/browser/android/large_icon_bridge.cc
|
| diff --git a/chrome/browser/android/large_icon_bridge.cc b/chrome/browser/android/large_icon_bridge.cc
|
| index cbff92d9da8d3268d6d7c5dd30fc16e6e839283e..513d46fa8b16f71153d3ef8ed565e77d3aef20d2 100644
|
| --- a/chrome/browser/android/large_icon_bridge.cc
|
| +++ b/chrome/browser/android/large_icon_bridge.cc
|
| @@ -30,8 +30,6 @@ using base::android::ConvertJavaStringToUTF16;
|
|
|
| namespace {
|
|
|
| -const SkColor kDefaultBackgroundColor = SkColorSetRGB(0x78, 0x78, 0x78);
|
| -
|
| void OnLargeIconAvailable(
|
| ScopedJavaGlobalRef<jobject>* j_callback,
|
| const favicon_base::LargeIconResult& result) {
|
| @@ -48,12 +46,13 @@ void OnLargeIconAvailable(
|
| 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
|
|
|