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

Side by Side Diff: components/cronet/android/cronet_url_request_adapter.cc

Issue 2347163002: s/NPN/ALPN/ (Closed)
Patch Set: Re: #12. Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/cronet/android/cronet_url_request_adapter.h" 5 #include "components/cronet/android/cronet_url_request_adapter.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 JNIEnv* env = base::android::AttachCurrentThread(); 200 JNIEnv* env = base::android::AttachCurrentThread();
201 cronet::Java_CronetUrlRequest_onRedirectReceived( 201 cronet::Java_CronetUrlRequest_onRedirectReceived(
202 env, owner_.obj(), 202 env, owner_.obj(),
203 ConvertUTF8ToJavaString(env, redirect_info.new_url.spec()).obj(), 203 ConvertUTF8ToJavaString(env, redirect_info.new_url.spec()).obj(),
204 redirect_info.status_code, 204 redirect_info.status_code,
205 ConvertUTF8ToJavaString(env, request->response_headers()->GetStatusText()) 205 ConvertUTF8ToJavaString(env, request->response_headers()->GetStatusText())
206 .obj(), 206 .obj(),
207 GetResponseHeaders(env).obj(), 207 GetResponseHeaders(env).obj(),
208 request->response_info().was_cached ? JNI_TRUE : JNI_FALSE, 208 request->response_info().was_cached ? JNI_TRUE : JNI_FALSE,
209 ConvertUTF8ToJavaString(env, 209 ConvertUTF8ToJavaString(env,
210 request->response_info().npn_negotiated_protocol) 210 request->response_info().alpn_negotiated_protocol)
211 .obj(), 211 .obj(),
212 ConvertUTF8ToJavaString(env, 212 ConvertUTF8ToJavaString(env,
213 request->response_info().proxy_server.ToString()) 213 request->response_info().proxy_server.ToString())
214 .obj(), 214 .obj(),
215 request->GetTotalReceivedBytes()); 215 request->GetTotalReceivedBytes());
216 *defer_redirect = true; 216 *defer_redirect = true;
217 } 217 }
218 218
219 void CronetURLRequestAdapter::OnCertificateRequested( 219 void CronetURLRequestAdapter::OnCertificateRequested(
220 net::URLRequest* request, 220 net::URLRequest* request,
(...skipping 23 matching lines...) Expand all
244 if (MaybeReportError(request)) 244 if (MaybeReportError(request))
245 return; 245 return;
246 JNIEnv* env = base::android::AttachCurrentThread(); 246 JNIEnv* env = base::android::AttachCurrentThread();
247 cronet::Java_CronetUrlRequest_onResponseStarted( 247 cronet::Java_CronetUrlRequest_onResponseStarted(
248 env, owner_.obj(), request->GetResponseCode(), 248 env, owner_.obj(), request->GetResponseCode(),
249 ConvertUTF8ToJavaString(env, request->response_headers()->GetStatusText()) 249 ConvertUTF8ToJavaString(env, request->response_headers()->GetStatusText())
250 .obj(), 250 .obj(),
251 GetResponseHeaders(env).obj(), 251 GetResponseHeaders(env).obj(),
252 request->response_info().was_cached ? JNI_TRUE : JNI_FALSE, 252 request->response_info().was_cached ? JNI_TRUE : JNI_FALSE,
253 ConvertUTF8ToJavaString(env, 253 ConvertUTF8ToJavaString(env,
254 request->response_info().npn_negotiated_protocol) 254 request->response_info().alpn_negotiated_protocol)
255 .obj(), 255 .obj(),
256 ConvertUTF8ToJavaString(env, 256 ConvertUTF8ToJavaString(env,
257 request->response_info().proxy_server.ToString()) 257 request->response_info().proxy_server.ToString())
258 .obj()); 258 .obj());
259 } 259 }
260 260
261 void CronetURLRequestAdapter::OnReadCompleted(net::URLRequest* request, 261 void CronetURLRequestAdapter::OnReadCompleted(net::URLRequest* request,
262 int bytes_read) { 262 int bytes_read) {
263 DCHECK(context_->IsOnNetworkThread()); 263 DCHECK(context_->IsOnNetworkThread());
264 if (MaybeReportError(request)) 264 if (MaybeReportError(request))
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), 379 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(),
380 request->GetTotalReceivedBytes()); 380 request->GetTotalReceivedBytes());
381 return true; 381 return true;
382 } 382 }
383 383
384 net::URLRequest* CronetURLRequestAdapter::GetURLRequestForTesting() { 384 net::URLRequest* CronetURLRequestAdapter::GetURLRequestForTesting() {
385 return url_request_.get(); 385 return url_request_.get();
386 } 386 }
387 387
388 } // namespace cronet 388 } // namespace cronet
OLDNEW
« no previous file with comments | « chrome/renderer/loadtimes_extension_bindings.cc ('k') | components/cronet/android/url_request_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698