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/ntp_snippets_bridge.h" | 5 #include "chrome/browser/android/ntp/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" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 void NTPSnippetsBridge::NTPSnippetsServiceLoaded() { | 109 void NTPSnippetsBridge::NTPSnippetsServiceLoaded() { |
110 if (observer_.is_null()) | 110 if (observer_.is_null()) |
111 return; | 111 return; |
112 | 112 |
113 std::vector<std::string> titles; | 113 std::vector<std::string> titles; |
114 std::vector<std::string> urls; | 114 std::vector<std::string> urls; |
115 std::vector<std::string> thumbnail_urls; | 115 std::vector<std::string> thumbnail_urls; |
116 std::vector<std::string> snippets; | 116 std::vector<std::string> snippets; |
117 std::vector<int64_t> timestamps; | 117 std::vector<int64_t> timestamps; |
| 118 std::vector<std::string> publishers; |
118 for (const ntp_snippets::NTPSnippet& snippet : *ntp_snippets_service_) { | 119 for (const ntp_snippets::NTPSnippet& snippet : *ntp_snippets_service_) { |
119 titles.push_back(snippet.title()); | 120 titles.push_back(snippet.title()); |
120 urls.push_back(snippet.url().spec()); | 121 urls.push_back(snippet.url().spec()); |
121 thumbnail_urls.push_back(snippet.salient_image_url().spec()); | 122 thumbnail_urls.push_back(snippet.salient_image_url().spec()); |
122 snippets.push_back(snippet.snippet()); | 123 snippets.push_back(snippet.snippet()); |
123 timestamps.push_back(snippet.publish_date().ToJavaTime()); | 124 timestamps.push_back(snippet.publish_date().ToJavaTime()); |
| 125 publishers.push_back(snippet.site_title()); |
124 } | 126 } |
125 | 127 |
126 JNIEnv* env = base::android::AttachCurrentThread(); | 128 JNIEnv* env = base::android::AttachCurrentThread(); |
127 Java_SnippetsBridge_onSnippetsAvailable( | 129 Java_SnippetsBridge_onSnippetsAvailable( |
128 env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(), | 130 env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(), |
129 ToJavaArrayOfStrings(env, urls).obj(), | 131 ToJavaArrayOfStrings(env, urls).obj(), |
130 ToJavaArrayOfStrings(env, thumbnail_urls).obj(), | 132 ToJavaArrayOfStrings(env, thumbnail_urls).obj(), |
131 ToJavaArrayOfStrings(env, snippets).obj(), | 133 ToJavaArrayOfStrings(env, snippets).obj(), |
132 ToJavaLongArray(env, timestamps).obj()); | 134 ToJavaLongArray(env, timestamps).obj(), |
| 135 ToJavaArrayOfStrings(env, publishers).obj()); |
133 } | 136 } |
134 | 137 |
135 void NTPSnippetsBridge::NTPSnippetsServiceShutdown() { | 138 void NTPSnippetsBridge::NTPSnippetsServiceShutdown() { |
136 observer_.Reset(); | 139 observer_.Reset(); |
137 snippet_service_observer_.Remove(ntp_snippets_service_); | 140 snippet_service_observer_.Remove(ntp_snippets_service_); |
138 } | 141 } |
139 | 142 |
140 // static | 143 // static |
141 bool NTPSnippetsBridge::Register(JNIEnv* env) { | 144 bool NTPSnippetsBridge::Register(JNIEnv* env) { |
142 return RegisterNativesImpl(env); | 145 return RegisterNativesImpl(env); |
143 } | 146 } |
OLD | NEW |