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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 base::android::ScopedJavaLocalRef<jstring> j_context_language = | 139 base::android::ScopedJavaLocalRef<jstring> j_context_language = |
140 base::android::ConvertUTF8ToJavaString( | 140 base::android::ConvertUTF8ToJavaString( |
141 env, resolved_search_term.context_language.c_str()); | 141 env, resolved_search_term.context_language.c_str()); |
142 base::android::ScopedJavaLocalRef<jstring> j_thumbnail_url = | 142 base::android::ScopedJavaLocalRef<jstring> j_thumbnail_url = |
143 base::android::ConvertUTF8ToJavaString( | 143 base::android::ConvertUTF8ToJavaString( |
144 env, | 144 env, |
145 resolved_search_term.thumbnail_url.c_str()); | 145 resolved_search_term.thumbnail_url.c_str()); |
146 base::android::ScopedJavaLocalRef<jstring> j_caption = | 146 base::android::ScopedJavaLocalRef<jstring> j_caption = |
147 base::android::ConvertUTF8ToJavaString( | 147 base::android::ConvertUTF8ToJavaString( |
148 env, resolved_search_term.caption.c_str()); | 148 env, resolved_search_term.caption.c_str()); |
| 149 base::android::ScopedJavaLocalRef<jstring> j_quick_action_uri = |
| 150 base::android::ConvertUTF8ToJavaString( |
| 151 env, resolved_search_term.quick_action_uri.c_str()); |
| 152 base::android::ScopedJavaLocalRef<jstring> j_quick_action_category = |
| 153 base::android::ConvertUTF8ToJavaString( |
| 154 env, resolved_search_term.quick_action_category.c_str()); |
149 Java_ContextualSearchManager_onSearchTermResolutionResponse( | 155 Java_ContextualSearchManager_onSearchTermResolutionResponse( |
150 env, java_manager_, resolved_search_term.is_invalid, | 156 env, java_manager_, resolved_search_term.is_invalid, |
151 resolved_search_term.response_code, j_search_term, j_display_text, | 157 resolved_search_term.response_code, j_search_term, j_display_text, |
152 j_alternate_term, j_mid, resolved_search_term.prevent_preload, | 158 j_alternate_term, j_mid, resolved_search_term.prevent_preload, |
153 resolved_search_term.selection_start_adjust, | 159 resolved_search_term.selection_start_adjust, |
154 resolved_search_term.selection_end_adjust, j_context_language, | 160 resolved_search_term.selection_end_adjust, j_context_language, |
155 j_thumbnail_url, j_caption); | 161 j_thumbnail_url, j_caption, j_quick_action_uri, j_quick_action_category); |
156 } | 162 } |
157 | 163 |
158 void ContextualSearchManager::OnSurroundingTextAvailable( | 164 void ContextualSearchManager::OnSurroundingTextAvailable( |
159 const std::string& after_text) { | 165 const std::string& after_text) { |
160 JNIEnv* env = base::android::AttachCurrentThread(); | 166 JNIEnv* env = base::android::AttachCurrentThread(); |
161 base::android::ScopedJavaLocalRef<jstring> j_after_text = | 167 base::android::ScopedJavaLocalRef<jstring> j_after_text = |
162 base::android::ConvertUTF8ToJavaString(env, after_text.c_str()); | 168 base::android::ConvertUTF8ToJavaString(env, after_text.c_str()); |
163 Java_ContextualSearchManager_onSurroundingTextAvailable(env, java_manager_, | 169 Java_ContextualSearchManager_onSurroundingTextAvailable(env, java_manager_, |
164 j_after_text); | 170 j_after_text); |
165 } | 171 } |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 } | 217 } |
212 | 218 |
213 void ContextualSearchManager::SetCaption(std::string caption, | 219 void ContextualSearchManager::SetCaption(std::string caption, |
214 bool does_answer) { | 220 bool does_answer) { |
215 JNIEnv* env = base::android::AttachCurrentThread(); | 221 JNIEnv* env = base::android::AttachCurrentThread(); |
216 base::android::ScopedJavaLocalRef<jstring> j_caption = | 222 base::android::ScopedJavaLocalRef<jstring> j_caption = |
217 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); | 223 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); |
218 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, | 224 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, |
219 does_answer); | 225 does_answer); |
220 } | 226 } |
OLD | NEW |