OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/contextualsearch/contextual_search_manager.h" | 5 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 env, resolved_search_term.display_text.c_str()); | 130 env, resolved_search_term.display_text.c_str()); |
131 base::android::ScopedJavaLocalRef<jstring> j_alternate_term = | 131 base::android::ScopedJavaLocalRef<jstring> j_alternate_term = |
132 base::android::ConvertUTF8ToJavaString( | 132 base::android::ConvertUTF8ToJavaString( |
133 env, resolved_search_term.alternate_term.c_str()); | 133 env, resolved_search_term.alternate_term.c_str()); |
134 base::android::ScopedJavaLocalRef<jstring> j_mid = | 134 base::android::ScopedJavaLocalRef<jstring> j_mid = |
135 base::android::ConvertUTF8ToJavaString(env, | 135 base::android::ConvertUTF8ToJavaString(env, |
136 resolved_search_term.mid.c_str()); | 136 resolved_search_term.mid.c_str()); |
137 base::android::ScopedJavaLocalRef<jstring> j_context_language = | 137 base::android::ScopedJavaLocalRef<jstring> j_context_language = |
138 base::android::ConvertUTF8ToJavaString( | 138 base::android::ConvertUTF8ToJavaString( |
139 env, resolved_search_term.context_language.c_str()); | 139 env, resolved_search_term.context_language.c_str()); |
| 140 base::android::ScopedJavaLocalRef<jstring> j_thumbnail_url = |
| 141 base::android::ConvertUTF8ToJavaString( |
| 142 env, |
| 143 resolved_search_term.thumbnail_url.c_str()); |
140 Java_ContextualSearchManager_onSearchTermResolutionResponse( | 144 Java_ContextualSearchManager_onSearchTermResolutionResponse( |
141 env, java_manager_, resolved_search_term.is_invalid, | 145 env, java_manager_, resolved_search_term.is_invalid, |
142 resolved_search_term.response_code, j_search_term, j_display_text, | 146 resolved_search_term.response_code, j_search_term, j_display_text, |
143 j_alternate_term, j_mid, resolved_search_term.prevent_preload, | 147 j_alternate_term, j_mid, resolved_search_term.prevent_preload, |
144 resolved_search_term.selection_start_adjust, | 148 resolved_search_term.selection_start_adjust, |
145 resolved_search_term.selection_end_adjust, j_context_language); | 149 resolved_search_term.selection_end_adjust, j_context_language, |
| 150 j_thumbnail_url); |
146 } | 151 } |
147 | 152 |
148 void ContextualSearchManager::OnSurroundingTextAvailable( | 153 void ContextualSearchManager::OnSurroundingTextAvailable( |
149 const std::string& after_text) { | 154 const std::string& after_text) { |
150 JNIEnv* env = base::android::AttachCurrentThread(); | 155 JNIEnv* env = base::android::AttachCurrentThread(); |
151 base::android::ScopedJavaLocalRef<jstring> j_after_text = | 156 base::android::ScopedJavaLocalRef<jstring> j_after_text = |
152 base::android::ConvertUTF8ToJavaString(env, after_text.c_str()); | 157 base::android::ConvertUTF8ToJavaString(env, after_text.c_str()); |
153 Java_ContextualSearchManager_onSurroundingTextAvailable(env, java_manager_, | 158 Java_ContextualSearchManager_onSurroundingTextAvailable(env, java_manager_, |
154 j_after_text); | 159 j_after_text); |
155 } | 160 } |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 } | 206 } |
202 | 207 |
203 void ContextualSearchManager::SetCaption(std::string caption, | 208 void ContextualSearchManager::SetCaption(std::string caption, |
204 bool does_answer) { | 209 bool does_answer) { |
205 JNIEnv* env = base::android::AttachCurrentThread(); | 210 JNIEnv* env = base::android::AttachCurrentThread(); |
206 base::android::ScopedJavaLocalRef<jstring> j_caption = | 211 base::android::ScopedJavaLocalRef<jstring> j_caption = |
207 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); | 212 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); |
208 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, | 213 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, |
209 does_answer); | 214 does_answer); |
210 } | 215 } |
OLD | NEW |