| Index: chrome/browser/android/ntp/ntp_snippets_bridge.cc
|
| diff --git a/chrome/browser/android/ntp/ntp_snippets_bridge.cc b/chrome/browser/android/ntp/ntp_snippets_bridge.cc
|
| index aa813a514522abfc63eae9611d3c0774e605bc54..2ae88b6ffc1dd697c76cc5d9725efe462674b1a3 100644
|
| --- a/chrome/browser/android/ntp/ntp_snippets_bridge.cc
|
| +++ b/chrome/browser/android/ntp/ntp_snippets_bridge.cc
|
| @@ -19,8 +19,8 @@
|
| #include "components/ntp_snippets/ntp_snippet.h"
|
| #include "components/ntp_snippets/ntp_snippets_service.h"
|
| #include "jni/SnippetsBridge_jni.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/gfx/android/java_bitmap.h"
|
| +#include "ui/gfx/image/image.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| using base::android::ConvertJavaStringToUTF8;
|
| @@ -177,12 +177,12 @@ void NTPSnippetsBridge::NTPSnippetsServiceCleared() {
|
|
|
| void NTPSnippetsBridge::OnImageFetched(ScopedJavaGlobalRef<jobject> callback,
|
| const std::string& snippet_id,
|
| - const SkBitmap* bitmap) {
|
| + const gfx::Image& image) {
|
| JNIEnv* env = AttachCurrentThread();
|
|
|
| ScopedJavaLocalRef<jobject> j_bitmap;
|
| - if (bitmap && !bitmap->isNull())
|
| - j_bitmap = gfx::ConvertToJavaBitmap(bitmap);
|
| + if (!image.IsEmpty())
|
| + j_bitmap = gfx::ConvertToJavaBitmap(image.ToSkBitmap());
|
|
|
| Java_FetchSnippetImageCallback_onSnippetImageAvailable(env, callback.obj(),
|
| j_bitmap.obj());
|
|
|