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

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

Issue 2624583002: Remove redundant c_str() calls. (Closed)
Patch Set: Revert some changes Created 3 years, 9 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
« no previous file with comments | « base/i18n/file_util_icu.cc ('k') | chrome/browser/android/contextualsearch/ctr_suppression.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 delegate_->GatherAndSaveSurroundingText(contextual_search_context, 92 delegate_->GatherAndSaveSurroundingText(contextual_search_context,
93 base_web_contents); 93 base_web_contents);
94 } 94 }
95 95
96 base::android::ScopedJavaLocalRef<jstring> 96 base::android::ScopedJavaLocalRef<jstring>
97 ContextualSearchManager::GetTargetLanguage(JNIEnv* env, 97 ContextualSearchManager::GetTargetLanguage(JNIEnv* env,
98 const JavaParamRef<jobject>& obj) { 98 const JavaParamRef<jobject>& obj) {
99 DCHECK(delegate_); 99 DCHECK(delegate_);
100 std::string target_language(delegate_->GetTargetLanguage()); 100 std::string target_language(delegate_->GetTargetLanguage());
101 base::android::ScopedJavaLocalRef<jstring> j_target_language = 101 base::android::ScopedJavaLocalRef<jstring> j_target_language =
102 base::android::ConvertUTF8ToJavaString(env, target_language.c_str()); 102 base::android::ConvertUTF8ToJavaString(env, target_language);
103 return j_target_language; 103 return j_target_language;
104 } 104 }
105 105
106 base::android::ScopedJavaLocalRef<jstring> 106 base::android::ScopedJavaLocalRef<jstring>
107 ContextualSearchManager::GetAcceptLanguages(JNIEnv* env, 107 ContextualSearchManager::GetAcceptLanguages(JNIEnv* env,
108 const JavaParamRef<jobject>& obj) { 108 const JavaParamRef<jobject>& obj) {
109 std::string accept_languages = delegate_->GetAcceptLanguages(); 109 std::string accept_languages = delegate_->GetAcceptLanguages();
110 base::android::ScopedJavaLocalRef<jstring> j_accept_languages = 110 base::android::ScopedJavaLocalRef<jstring> j_accept_languages =
111 base::android::ConvertUTF8ToJavaString(env, accept_languages.c_str()); 111 base::android::ConvertUTF8ToJavaString(env, accept_languages);
112 return j_accept_languages; 112 return j_accept_languages;
113 } 113 }
114 114
115 void ContextualSearchManager::OnSearchTermResolutionResponse( 115 void ContextualSearchManager::OnSearchTermResolutionResponse(
116 const ResolvedSearchTerm& resolved_search_term) { 116 const ResolvedSearchTerm& resolved_search_term) {
117 // Notify the Java UX of the result. 117 // Notify the Java UX of the result.
118 JNIEnv* env = base::android::AttachCurrentThread(); 118 JNIEnv* env = base::android::AttachCurrentThread();
119 base::android::ScopedJavaLocalRef<jstring> j_search_term = 119 base::android::ScopedJavaLocalRef<jstring> j_search_term =
120 base::android::ConvertUTF8ToJavaString( 120 base::android::ConvertUTF8ToJavaString(env,
121 env, resolved_search_term.search_term.c_str()); 121 resolved_search_term.search_term);
122 base::android::ScopedJavaLocalRef<jstring> j_display_text = 122 base::android::ScopedJavaLocalRef<jstring> j_display_text =
123 base::android::ConvertUTF8ToJavaString( 123 base::android::ConvertUTF8ToJavaString(env,
124 env, resolved_search_term.display_text.c_str()); 124 resolved_search_term.display_text);
125 base::android::ScopedJavaLocalRef<jstring> j_alternate_term = 125 base::android::ScopedJavaLocalRef<jstring> j_alternate_term =
126 base::android::ConvertUTF8ToJavaString( 126 base::android::ConvertUTF8ToJavaString(
127 env, resolved_search_term.alternate_term.c_str()); 127 env, resolved_search_term.alternate_term);
128 base::android::ScopedJavaLocalRef<jstring> j_mid = 128 base::android::ScopedJavaLocalRef<jstring> j_mid =
129 base::android::ConvertUTF8ToJavaString(env, 129 base::android::ConvertUTF8ToJavaString(env, resolved_search_term.mid);
130 resolved_search_term.mid.c_str());
131 base::android::ScopedJavaLocalRef<jstring> j_context_language = 130 base::android::ScopedJavaLocalRef<jstring> j_context_language =
132 base::android::ConvertUTF8ToJavaString( 131 base::android::ConvertUTF8ToJavaString(
133 env, resolved_search_term.context_language.c_str()); 132 env, resolved_search_term.context_language);
134 base::android::ScopedJavaLocalRef<jstring> j_thumbnail_url = 133 base::android::ScopedJavaLocalRef<jstring> j_thumbnail_url =
135 base::android::ConvertUTF8ToJavaString( 134 base::android::ConvertUTF8ToJavaString(
136 env, 135 env, resolved_search_term.thumbnail_url);
137 resolved_search_term.thumbnail_url.c_str());
138 base::android::ScopedJavaLocalRef<jstring> j_caption = 136 base::android::ScopedJavaLocalRef<jstring> j_caption =
139 base::android::ConvertUTF8ToJavaString( 137 base::android::ConvertUTF8ToJavaString(env, resolved_search_term.caption);
140 env, resolved_search_term.caption.c_str());
141 base::android::ScopedJavaLocalRef<jstring> j_quick_action_uri = 138 base::android::ScopedJavaLocalRef<jstring> j_quick_action_uri =
142 base::android::ConvertUTF8ToJavaString( 139 base::android::ConvertUTF8ToJavaString(
143 env, resolved_search_term.quick_action_uri.c_str()); 140 env, resolved_search_term.quick_action_uri);
144 Java_ContextualSearchManager_onSearchTermResolutionResponse( 141 Java_ContextualSearchManager_onSearchTermResolutionResponse(
145 env, java_manager_, resolved_search_term.is_invalid, 142 env, java_manager_, resolved_search_term.is_invalid,
146 resolved_search_term.response_code, j_search_term, j_display_text, 143 resolved_search_term.response_code, j_search_term, j_display_text,
147 j_alternate_term, j_mid, resolved_search_term.prevent_preload, 144 j_alternate_term, j_mid, resolved_search_term.prevent_preload,
148 resolved_search_term.selection_start_adjust, 145 resolved_search_term.selection_start_adjust,
149 resolved_search_term.selection_end_adjust, j_context_language, 146 resolved_search_term.selection_end_adjust, j_context_language,
150 j_thumbnail_url, j_caption, j_quick_action_uri, 147 j_thumbnail_url, j_caption, j_quick_action_uri,
151 resolved_search_term.quick_action_category); 148 resolved_search_term.quick_action_category);
152 } 149 }
153 150
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 204 }
208 205
209 void ContextualSearchManager::SetCaption(std::string caption, 206 void ContextualSearchManager::SetCaption(std::string caption,
210 bool does_answer) { 207 bool does_answer) {
211 JNIEnv* env = base::android::AttachCurrentThread(); 208 JNIEnv* env = base::android::AttachCurrentThread();
212 base::android::ScopedJavaLocalRef<jstring> j_caption = 209 base::android::ScopedJavaLocalRef<jstring> j_caption =
213 base::android::ConvertUTF8ToJavaString(env, caption.c_str()); 210 base::android::ConvertUTF8ToJavaString(env, caption.c_str());
214 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption, 211 Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption,
215 does_answer); 212 does_answer);
216 } 213 }
OLDNEW
« no previous file with comments | « base/i18n/file_util_icu.cc ('k') | chrome/browser/android/contextualsearch/ctr_suppression.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698