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

Side by Side Diff: chrome/browser/android/download/chrome_download_delegate.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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/download/chrome_download_delegate.h" 5 #include "chrome/browser/android/download/chrome_download_delegate.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include <string> 9 #include <string>
10 #include <type_traits> 10 #include <type_traits>
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ConvertUTF8ToJavaString(env, mime_type); 164 ConvertUTF8ToJavaString(env, mime_type);
165 ScopedJavaLocalRef<jstring> jcookie = 165 ScopedJavaLocalRef<jstring> jcookie =
166 ConvertUTF8ToJavaString(env, cookie); 166 ConvertUTF8ToJavaString(env, cookie);
167 ScopedJavaLocalRef<jstring> jreferer = 167 ScopedJavaLocalRef<jstring> jreferer =
168 ConvertUTF8ToJavaString(env, referer); 168 ConvertUTF8ToJavaString(env, referer);
169 169
170 // net::GetSuggestedFilename will fallback to "download" as filename. 170 // net::GetSuggestedFilename will fallback to "download" as filename.
171 ScopedJavaLocalRef<jstring> jfilename = 171 ScopedJavaLocalRef<jstring> jfilename =
172 base::android::ConvertUTF16ToJavaString(env, file_name); 172 base::android::ConvertUTF16ToJavaString(env, file_name);
173 Java_ChromeDownloadDelegate_requestHttpGetDownload( 173 Java_ChromeDownloadDelegate_requestHttpGetDownload(
174 env, java_ref_, 174 env, java_ref_, jurl, juser_agent, jcontent_disposition, jmime_type,
175 jurl.obj(), juser_agent.obj(), jcontent_disposition.obj(), 175 jcookie, jreferer, has_user_gesture, jfilename, content_length,
176 jmime_type.obj(), jcookie.obj(), jreferer.obj(), has_user_gesture, 176 must_download);
177 jfilename.obj(), content_length, must_download);
178 } 177 }
179 178
180 void ChromeDownloadDelegate::OnDownloadStarted(const std::string& filename, 179 void ChromeDownloadDelegate::OnDownloadStarted(const std::string& filename,
181 const std::string& mime_type) { 180 const std::string& mime_type) {
182 JNIEnv* env = base::android::AttachCurrentThread(); 181 JNIEnv* env = base::android::AttachCurrentThread();
183 ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString( 182 ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString(
184 env, filename); 183 env, filename);
185 ScopedJavaLocalRef<jstring> jmime_type = 184 ScopedJavaLocalRef<jstring> jmime_type =
186 ConvertUTF8ToJavaString(env, mime_type); 185 ConvertUTF8ToJavaString(env, mime_type);
187 Java_ChromeDownloadDelegate_onDownloadStarted( 186 Java_ChromeDownloadDelegate_onDownloadStarted(env, java_ref_, jfilename,
188 env, java_ref_, jfilename.obj(), jmime_type.obj()); 187 jmime_type);
189 } 188 }
190 189
191 void ChromeDownloadDelegate::OnDangerousDownload(const std::string& filename, 190 void ChromeDownloadDelegate::OnDangerousDownload(const std::string& filename,
192 const std::string& guid) { 191 const std::string& guid) {
193 JNIEnv* env = base::android::AttachCurrentThread(); 192 JNIEnv* env = base::android::AttachCurrentThread();
194 ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString( 193 ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString(
195 env, filename); 194 env, filename);
196 ScopedJavaLocalRef<jstring> jguid = ConvertUTF8ToJavaString(env, guid); 195 ScopedJavaLocalRef<jstring> jguid = ConvertUTF8ToJavaString(env, guid);
197 Java_ChromeDownloadDelegate_onDangerousDownload( 196 Java_ChromeDownloadDelegate_onDangerousDownload(env, java_ref_, jfilename,
198 env, java_ref_, jfilename.obj(), jguid.obj()); 197 jguid);
199 } 198 }
200 199
201 void ChromeDownloadDelegate::RequestFileAccess(intptr_t callback_id) { 200 void ChromeDownloadDelegate::RequestFileAccess(intptr_t callback_id) {
202 JNIEnv* env = base::android::AttachCurrentThread(); 201 JNIEnv* env = base::android::AttachCurrentThread();
203 Java_ChromeDownloadDelegate_requestFileAccess( 202 Java_ChromeDownloadDelegate_requestFileAccess(
204 env, java_ref_, callback_id); 203 env, java_ref_, callback_id);
205 } 204 }
206 205
207 void Init(JNIEnv* env, 206 void Init(JNIEnv* env,
208 const JavaParamRef<jobject>& obj, 207 const JavaParamRef<jobject>& obj,
209 const JavaParamRef<jobject>& jweb_contents) { 208 const JavaParamRef<jobject>& jweb_contents) {
210 auto* web_contents = WebContents::FromJavaWebContents(jweb_contents); 209 auto* web_contents = WebContents::FromJavaWebContents(jweb_contents);
211 ChromeDownloadDelegate::CreateForWebContents(web_contents); 210 ChromeDownloadDelegate::CreateForWebContents(web_contents);
212 ChromeDownloadDelegate::FromWebContents(web_contents)->SetJavaRef(env, obj); 211 ChromeDownloadDelegate::FromWebContents(web_contents)->SetJavaRef(env, obj);
213 } 212 }
214 213
215 bool RegisterChromeDownloadDelegate(JNIEnv* env) { 214 bool RegisterChromeDownloadDelegate(JNIEnv* env) {
216 return RegisterNativesImpl(env); 215 return RegisterNativesImpl(env);
217 } 216 }
218 217
219 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeDownloadDelegate); 218 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeDownloadDelegate);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698