Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: chrome/browser/android/contextualsearch/contextual_search_manager.cc

Issue 2624583002: Remove redundant c_str() calls. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 base_web_contents, 100 base_web_contents,
101 may_send_base_page_url); 101 may_send_base_page_url);
102 } 102 }
103 103
104 base::android::ScopedJavaLocalRef<jstring> 104 base::android::ScopedJavaLocalRef<jstring>
105 ContextualSearchManager::GetTargetLanguage(JNIEnv* env, 105 ContextualSearchManager::GetTargetLanguage(JNIEnv* env,
106 const JavaParamRef<jobject>& obj) { 106 const JavaParamRef<jobject>& obj) {
107 DCHECK(delegate_); 107 DCHECK(delegate_);
108 std::string target_language(delegate_->GetTargetLanguage()); 108 std::string target_language(delegate_->GetTargetLanguage());
109 base::android::ScopedJavaLocalRef<jstring> j_target_language = 109 base::android::ScopedJavaLocalRef<jstring> j_target_language =
110 base::android::ConvertUTF8ToJavaString(env, target_language.c_str()); 110 base::android::ConvertUTF8ToJavaString(env, target_language);
111 return j_target_language; 111 return j_target_language;
112 } 112 }
113 113
114 base::android::ScopedJavaLocalRef<jstring> 114 base::android::ScopedJavaLocalRef<jstring>
115 ContextualSearchManager::GetAcceptLanguages(JNIEnv* env, 115 ContextualSearchManager::GetAcceptLanguages(JNIEnv* env,
116 const JavaParamRef<jobject>& obj) { 116 const JavaParamRef<jobject>& obj) {
117 std::string accept_languages = delegate_->GetAcceptLanguages(); 117 std::string accept_languages = delegate_->GetAcceptLanguages();
118 base::android::ScopedJavaLocalRef<jstring> j_accept_languages = 118 base::android::ScopedJavaLocalRef<jstring> j_accept_languages =
119 base::android::ConvertUTF8ToJavaString(env, accept_languages.c_str()); 119 base::android::ConvertUTF8ToJavaString(env, accept_languages);
120 return j_accept_languages; 120 return j_accept_languages;
121 } 121 }
122 122
123 void ContextualSearchManager::OnSearchTermResolutionResponse( 123 void ContextualSearchManager::OnSearchTermResolutionResponse(
124 const ResolvedSearchTerm& resolved_search_term) { 124 const ResolvedSearchTerm& resolved_search_term) {
125 // Notify the Java UX of the result. 125 // Notify the Java UX of the result.
126 JNIEnv* env = base::android::AttachCurrentThread(); 126 JNIEnv* env = base::android::AttachCurrentThread();
127 base::android::ScopedJavaLocalRef<jstring> j_search_term = 127 base::android::ScopedJavaLocalRef<jstring> j_search_term =
128 base::android::ConvertUTF8ToJavaString( 128 base::android::ConvertUTF8ToJavaString(
129 env, resolved_search_term.search_term.c_str()); 129 env, resolved_search_term.search_term);
130 base::android::ScopedJavaLocalRef<jstring> j_display_text = 130 base::android::ScopedJavaLocalRef<jstring> j_display_text =
131 base::android::ConvertUTF8ToJavaString( 131 base::android::ConvertUTF8ToJavaString(
132 env, resolved_search_term.display_text.c_str()); 132 env, resolved_search_term.display_text);
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);
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);
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);
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);
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);
149 base::android::ScopedJavaLocalRef<jstring> j_quick_action_uri = 149 base::android::ScopedJavaLocalRef<jstring> j_quick_action_uri =
150 base::android::ConvertUTF8ToJavaString( 150 base::android::ConvertUTF8ToJavaString(
151 env, resolved_search_term.quick_action_uri.c_str()); 151 env, resolved_search_term.quick_action_uri);
152 Java_ContextualSearchManager_onSearchTermResolutionResponse( 152 Java_ContextualSearchManager_onSearchTermResolutionResponse(
153 env, java_manager_, resolved_search_term.is_invalid, 153 env, java_manager_, resolved_search_term.is_invalid,
154 resolved_search_term.response_code, j_search_term, j_display_text, 154 resolved_search_term.response_code, j_search_term, j_display_text,
155 j_alternate_term, j_mid, resolved_search_term.prevent_preload, 155 j_alternate_term, j_mid, resolved_search_term.prevent_preload,
156 resolved_search_term.selection_start_adjust, 156 resolved_search_term.selection_start_adjust,
157 resolved_search_term.selection_end_adjust, j_context_language, 157 resolved_search_term.selection_end_adjust, j_context_language,
158 j_thumbnail_url, j_caption, j_quick_action_uri, 158 j_thumbnail_url, j_caption, j_quick_action_uri,
159 resolved_search_term.quick_action_category); 159 resolved_search_term.quick_action_category);
160 } 160 }
161 161
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 } 215 }
216 216
217 void ContextualSearchManager::SetCaption(std::string caption, 217 void ContextualSearchManager::SetCaption(std::string caption,
218 bool does_answer) { 218 bool does_answer) {
219 JNIEnv* env = base::android::AttachCurrentThread(); 219 JNIEnv* env = base::android::AttachCurrentThread();
220 base::android::ScopedJavaLocalRef<jstring> j_caption = 220 base::android::ScopedJavaLocalRef<jstring> j_caption =
221 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); 221 base::android::ConvertUTF8ToJavaString(env, caption.c_str());
222 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, 222 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption,
223 does_answer); 223 does_answer);
224 } 224 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698