| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 env, resolved_search_term.display_text.c_str()); | 132 env, resolved_search_term.display_text.c_str()); |
| 133 base::android::ScopedJavaLocalRef<jstring> j_alternate_term = | 133 base::android::ScopedJavaLocalRef<jstring> j_alternate_term = |
| 134 base::android::ConvertUTF8ToJavaString( | 134 base::android::ConvertUTF8ToJavaString( |
| 135 env, resolved_search_term.alternate_term.c_str()); | 135 env, resolved_search_term.alternate_term.c_str()); |
| 136 base::android::ScopedJavaLocalRef<jstring> j_mid = | 136 base::android::ScopedJavaLocalRef<jstring> j_mid = |
| 137 base::android::ConvertUTF8ToJavaString(env, | 137 base::android::ConvertUTF8ToJavaString(env, |
| 138 resolved_search_term.mid.c_str()); | 138 resolved_search_term.mid.c_str()); |
| 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 = |
| 143 base::android::ConvertUTF8ToJavaString( |
| 144 env, |
| 145 resolved_search_term.thumbnail_url.c_str()); |
| 142 Java_ContextualSearchManager_onSearchTermResolutionResponse( | 146 Java_ContextualSearchManager_onSearchTermResolutionResponse( |
| 143 env, java_manager_, resolved_search_term.is_invalid, | 147 env, java_manager_, resolved_search_term.is_invalid, |
| 144 resolved_search_term.response_code, j_search_term, j_display_text, | 148 resolved_search_term.response_code, j_search_term, j_display_text, |
| 145 j_alternate_term, j_mid, resolved_search_term.prevent_preload, | 149 j_alternate_term, j_mid, resolved_search_term.prevent_preload, |
| 146 resolved_search_term.selection_start_adjust, | 150 resolved_search_term.selection_start_adjust, |
| 147 resolved_search_term.selection_end_adjust, j_context_language); | 151 resolved_search_term.selection_end_adjust, j_context_language, |
| 152 j_thumbnail_url); |
| 148 } | 153 } |
| 149 | 154 |
| 150 void ContextualSearchManager::OnSurroundingTextAvailable( | 155 void ContextualSearchManager::OnSurroundingTextAvailable( |
| 151 const std::string& after_text) { | 156 const std::string& after_text) { |
| 152 JNIEnv* env = base::android::AttachCurrentThread(); | 157 JNIEnv* env = base::android::AttachCurrentThread(); |
| 153 base::android::ScopedJavaLocalRef<jstring> j_after_text = | 158 base::android::ScopedJavaLocalRef<jstring> j_after_text = |
| 154 base::android::ConvertUTF8ToJavaString(env, after_text.c_str()); | 159 base::android::ConvertUTF8ToJavaString(env, after_text.c_str()); |
| 155 Java_ContextualSearchManager_onSurroundingTextAvailable(env, java_manager_, | 160 Java_ContextualSearchManager_onSurroundingTextAvailable(env, java_manager_, |
| 156 j_after_text); | 161 j_after_text); |
| 157 } | 162 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 } | 208 } |
| 204 | 209 |
| 205 void ContextualSearchManager::SetCaption(std::string caption, | 210 void ContextualSearchManager::SetCaption(std::string caption, |
| 206 bool does_answer) { | 211 bool does_answer) { |
| 207 JNIEnv* env = base::android::AttachCurrentThread(); | 212 JNIEnv* env = base::android::AttachCurrentThread(); |
| 208 base::android::ScopedJavaLocalRef<jstring> j_caption = | 213 base::android::ScopedJavaLocalRef<jstring> j_caption = |
| 209 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); | 214 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); |
| 210 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, | 215 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, |
| 211 does_answer); | 216 does_answer); |
| 212 } | 217 } |
| OLD | NEW |