Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/ntp_snippets_bridge.h" | 5 #include "chrome/browser/android/ntp_snippets_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_array.h" | 10 #include "base/android/jni_array.h" |
| 11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
| 12 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h" | 12 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/profiles/profile_android.h" | 14 #include "chrome/browser/profiles/profile_android.h" |
| 15 #include "components/ntp_snippets/ntp_snippet.h" | 15 #include "components/ntp_snippets/ntp_snippet.h" |
| 16 #include "components/ntp_snippets/ntp_snippets_service.h" | 16 #include "components/ntp_snippets/ntp_snippets_service.h" |
| 17 #include "jni/SnippetsBridge_jni.h" | 17 #include "jni/SnippetsBridge_jni.h" |
| 18 | 18 |
| 19 using base::android::JavaParamRef; | 19 using base::android::JavaParamRef; |
| 20 using base::android::ToJavaArrayOfStrings; | 20 using base::android::ToJavaArrayOfStrings; |
| 21 using ntp_snippets::NTPSnippetsService; | 21 using ntp_snippets::NTPSnippetsService; |
| 22 using ntp_snippets::NTPSnippetsServiceObserver; | 22 using ntp_snippets::NTPSnippetsServiceObserver; |
| 23 | 23 |
| 24 static jlong Init(JNIEnv* env, | 24 static jlong Init(JNIEnv* env, |
| 25 const JavaParamRef<jobject>& obj, | 25 const JavaParamRef<jobject>& obj, |
| 26 const JavaParamRef<jobject>& j_profile, | 26 const JavaParamRef<jobject>& j_profile) { |
| 27 const JavaParamRef<jobject>& j_observer) { | 27 NTPSnippetsBridge* snippets_bridge = new NTPSnippetsBridge(env, j_profile); |
| 28 NTPSnippetsBridge* snippets_bridge = | |
| 29 new NTPSnippetsBridge(env, j_profile, j_observer); | |
| 30 return reinterpret_cast<intptr_t>(snippets_bridge); | 28 return reinterpret_cast<intptr_t>(snippets_bridge); |
| 31 } | 29 } |
| 32 | 30 |
| 33 NTPSnippetsBridge::NTPSnippetsBridge(JNIEnv* env, | 31 NTPSnippetsBridge::NTPSnippetsBridge(JNIEnv* env, jobject j_profile) |
|
Bernhard Bauer
2016/02/22 14:44:01
All of these should be JavaParamRef<jobject>, BTW.
Marc Treib
2016/02/22 17:22:49
Done. (Why don't we have some check for this?)
| |
| 34 jobject j_profile, | |
| 35 jobject j_observer) | |
| 36 : snippet_service_observer_(this) { | 32 : snippet_service_observer_(this) { |
| 37 observer_.Reset(env, j_observer); | |
| 38 | |
| 39 Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); | 33 Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); |
| 40 ntp_snippets_service_ = NTPSnippetsServiceFactory::GetForProfile(profile); | 34 ntp_snippets_service_ = NTPSnippetsServiceFactory::GetForProfile(profile); |
| 41 snippet_service_observer_.Add(ntp_snippets_service_); | 35 snippet_service_observer_.Add(ntp_snippets_service_); |
| 36 } | |
| 37 | |
| 38 void NTPSnippetsBridge::SetObserver( | |
| 39 JNIEnv* env, | |
| 40 const base::android::JavaParamRef<jobject>& obj, | |
| 41 jobject j_observer) { | |
| 42 observer_.Reset(env, j_observer); | |
| 43 | |
| 42 if (ntp_snippets_service_->is_loaded()) | 44 if (ntp_snippets_service_->is_loaded()) |
| 43 NTPSnippetsServiceLoaded(ntp_snippets_service_); | 45 NTPSnippetsServiceLoaded(ntp_snippets_service_); |
| 44 } | 46 } |
| 45 | 47 |
| 46 NTPSnippetsBridge::~NTPSnippetsBridge() {} | 48 NTPSnippetsBridge::~NTPSnippetsBridge() {} |
| 47 | 49 |
| 48 void NTPSnippetsBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 50 void NTPSnippetsBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 49 delete this; | 51 delete this; |
| 50 } | 52 } |
| 51 | 53 |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 75 void NTPSnippetsBridge::NTPSnippetsServiceShutdown( | 77 void NTPSnippetsBridge::NTPSnippetsServiceShutdown( |
| 76 NTPSnippetsService* service) { | 78 NTPSnippetsService* service) { |
| 77 observer_.Reset(); | 79 observer_.Reset(); |
| 78 snippet_service_observer_.Remove(ntp_snippets_service_); | 80 snippet_service_observer_.Remove(ntp_snippets_service_); |
| 79 } | 81 } |
| 80 | 82 |
| 81 // static | 83 // static |
| 82 bool NTPSnippetsBridge::Register(JNIEnv* env) { | 84 bool NTPSnippetsBridge::Register(JNIEnv* env) { |
| 83 return RegisterNativesImpl(env); | 85 return RegisterNativesImpl(env); |
| 84 } | 86 } |
| OLD | NEW |