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

Side by Side Diff: android_webview/native/aw_contents_io_thread_client_impl.cc

Issue 1594973004: Remove use of void** from HttpResponseHeaders::EnumerateHeaderLines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Created 4 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
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_ui_bindings.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "android_webview/native/aw_contents_io_thread_client_impl.h" 5 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "android_webview/common/devtools_instrumentation.h" 10 #include "android_webview/common/devtools_instrumentation.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 DCHECK_CURRENTLY_ON(BrowserThread::IO); 459 DCHECK_CURRENTLY_ON(BrowserThread::IO);
460 if (java_object_.is_null()) 460 if (java_object_.is_null())
461 return; 461 return;
462 462
463 JNIEnv* env = AttachCurrentThread(); 463 JNIEnv* env = AttachCurrentThread();
464 WebResourceRequest web_request(env, request); 464 WebResourceRequest web_request(env, request);
465 465
466 vector<string> response_header_names; 466 vector<string> response_header_names;
467 vector<string> response_header_values; 467 vector<string> response_header_values;
468 { 468 {
469 void* headers_iterator = NULL; 469 size_t headers_iterator = 0;
470 string header_name, header_value; 470 string header_name, header_value;
471 while (response_headers->EnumerateHeaderLines( 471 while (response_headers->EnumerateHeaderLines(
472 &headers_iterator, &header_name, &header_value)) { 472 &headers_iterator, &header_name, &header_value)) {
473 response_header_names.push_back(header_name); 473 response_header_names.push_back(header_name);
474 response_header_values.push_back(header_value); 474 response_header_values.push_back(header_value);
475 } 475 }
476 } 476 }
477 477
478 string mime_type, encoding; 478 string mime_type, encoding;
479 response_headers->GetMimeTypeAndCharset(&mime_type, &encoding); 479 response_headers->GetMimeTypeAndCharset(&mime_type, &encoding);
(...skipping 24 matching lines...) Expand all
504 jstring_reason.obj(), 504 jstring_reason.obj(),
505 jstringArray_response_header_names.obj(), 505 jstringArray_response_header_names.obj(),
506 jstringArray_response_header_values.obj()); 506 jstringArray_response_header_values.obj());
507 } 507 }
508 508
509 bool RegisterAwContentsIoThreadClientImpl(JNIEnv* env) { 509 bool RegisterAwContentsIoThreadClientImpl(JNIEnv* env) {
510 return RegisterNativesImpl(env); 510 return RegisterNativesImpl(env);
511 } 511 }
512 512
513 } // namespace android_webview 513 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_ui_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698