| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/omnibox/answers_image_bridge.h" | 5 #include "chrome/browser/android/omnibox/answers_image_bridge.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 // AnswersImageObserver: | 37 // AnswersImageObserver: |
| 38 void OnImageChanged(BitmapFetcherService::RequestId request_id, | 38 void OnImageChanged(BitmapFetcherService::RequestId request_id, |
| 39 const SkBitmap& answers_image) override { | 39 const SkBitmap& answers_image) override { |
| 40 DCHECK(!answers_image.empty()); | 40 DCHECK(!answers_image.empty()); |
| 41 | 41 |
| 42 JNIEnv* env = base::android::AttachCurrentThread(); | 42 JNIEnv* env = base::android::AttachCurrentThread(); |
| 43 ScopedJavaLocalRef<jobject> java_bitmap = | 43 ScopedJavaLocalRef<jobject> java_bitmap = |
| 44 gfx::ConvertToJavaBitmap(&answers_image); | 44 gfx::ConvertToJavaBitmap(&answers_image); |
| 45 Java_AnswersImageObserver_onAnswersImageChanged( | 45 Java_AnswersImageObserver_onAnswersImageChanged( |
| 46 env, java_answers_image_observer_.obj(), java_bitmap.obj()); | 46 env, java_answers_image_observer_, java_bitmap); |
| 47 } | 47 } |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 base::android::ScopedJavaGlobalRef<jobject> java_answers_image_observer_; | 50 base::android::ScopedJavaGlobalRef<jobject> java_answers_image_observer_; |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 } // namespace | 53 } // namespace |
| 54 | 54 |
| 55 static void CancelAnswersImageRequest(JNIEnv* env, | 55 static void CancelAnswersImageRequest(JNIEnv* env, |
| 56 const JavaParamRef<jclass>&, | 56 const JavaParamRef<jclass>&, |
| (...skipping 18 matching lines...) Expand all Loading... |
| 75 std::string url; | 75 std::string url; |
| 76 base::android::ConvertJavaStringToUTF8(env, java_url, &url); | 76 base::android::ConvertJavaStringToUTF8(env, java_url, &url); |
| 77 return bitmap_fetcher_service->RequestImage( | 77 return bitmap_fetcher_service->RequestImage( |
| 78 GURL(url), new AnswersImageObserverAndroid(env, java_callback)); | 78 GURL(url), new AnswersImageObserverAndroid(env, java_callback)); |
| 79 } | 79 } |
| 80 | 80 |
| 81 // static | 81 // static |
| 82 bool RegisterAnswersImageBridge(JNIEnv* env) { | 82 bool RegisterAnswersImageBridge(JNIEnv* env) { |
| 83 return RegisterNativesImpl(env); | 83 return RegisterNativesImpl(env); |
| 84 } | 84 } |
| OLD | NEW |