Index: chrome/browser/android/omnibox/answers_image_bridge.cc |
diff --git a/chrome/browser/android/omnibox/answers_image_bridge.cc b/chrome/browser/android/omnibox/answers_image_bridge.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..fcb81b939ef88a8e9d89385ef27f4d438369b5a8 |
--- /dev/null |
+++ b/chrome/browser/android/omnibox/answers_image_bridge.cc |
@@ -0,0 +1,85 @@ |
+// Copyright 2014 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/omnibox/answers_image_bridge.h" |
+ |
+#include <jni.h> |
+ |
+#include "base/android/jni_android.h" |
+#include "base/android/jni_string.h" |
+#include "base/android/scoped_java_ref.h" |
+#include "base/bind.h" |
+#include "chrome/browser/autocomplete/answers_image_service.h" |
+#include "chrome/browser/autocomplete/answers_image_service_factory.h" |
+#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/profiles/profile_android.h" |
+#include "jni/AnswersImage_jni.h" |
+#include "third_party/skia/include/core/SkBitmap.h" |
+#include "ui/gfx/android/java_bitmap.h" |
+#include "url/gurl.h" |
+ |
+using base::android::ScopedJavaLocalRef; |
+using base::android::ConvertUTF8ToJavaString; |
+ |
+namespace { |
+ |
+class AnswersImageObserverAndroid : public AnswersImageObserver { |
+ public: |
+ explicit AnswersImageObserverAndroid(jobject java_answers_image_observer) |
+ : java_answers_image_observer_(java_answers_image_observer) {} |
+ |
+ virtual ~AnswersImageObserverAndroid() {} |
+ |
+ // AnswersImageObserver: |
+ virtual void OnImageChanged(const SkBitmap& answers_image) OVERRIDE { |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ ScopedJavaLocalRef<jobject> java_bitmap = |
+ gfx::ConvertToJavaBitmap(&answers_image); |
+ Java_AnswersImageObserver_onAnswersImageChanged( |
+ env, java_answers_image_observer_, java_bitmap.obj()); |
+ } |
+ |
+ virtual void OnRequestFinished(int request_id) OVERRIDE { delete this; } |
+ |
+ private: |
+ jobject java_answers_image_observer_; |
Ted C
2014/06/06 01:49:23
Instead of a raw jobject, can you store this as a
groby-ooo-7-16
2014/06/13 23:52:21
I _am_ morbidly interested. Thanks for the pointer
|
+}; |
+ |
+} // namespace |
+ |
+static void CancelAnswersImageRequest(JNIEnv* env, |
+ jclass, |
+ jobject java_profile, |
+ jint java_request_id) { |
+ Profile* profile = ProfileAndroid::FromProfileAndroid(java_profile); |
+ if (profile) { |
+ AnswersImageService* answers_image_service = |
+ AnswersImageServiceFactory::GetForBrowserContext(profile); |
+ answers_image_service->CancelRequest(java_request_id); |
+ } |
+} |
+ |
+static jobject RequestAnswersImage(JNIEnv* env, |
+ jclass, |
+ jobject java_profile, |
+ jstring java_url, |
+ jobject java_callback) { |
+ Profile* profile = ProfileAndroid::FromProfileAndroid(java_profile); |
+ if (profile) { |
Ted C
2014/06/06 01:49:24
I would just dcheck profile here. People shouldn'
groby-ooo-7-16
2014/06/13 23:52:21
Done.
|
+ AnswersImageService* answers_image_service = |
+ AnswersImageServiceFactory::GetForBrowserContext(profile); |
+ std::string url; |
+ base::android::ConvertJavaStringToUTF8(env, java_url, &url); |
+ int request_id = answers_image_service->RequestImage( |
+ GURL(url), new AnswersImageObserverAndroid(java_callback)); |
+ return Java_AnswersImage_createAnswersImageRequest( |
+ env, java_callback, request_id).Release(); |
Ted C
2014/06/06 01:49:23
indented too much
groby-ooo-7-16
2014/06/13 23:52:21
That's what 'git cl format' believes to be correct
Ted C
2014/06/17 20:38:15
Nothing about this indenting looks sane to me. If
groby-ooo-7-16
2014/06/17 23:46:20
It _is_ somewhat sane in that the style guide does
|
+ } |
+ return NULL; |
+} |
+ |
+// static |
+bool RegisterAnswersImageBridge(JNIEnv* env) { |
+ return RegisterNativesImpl(env); |
+} |