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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 780383002: Don't key client auth on HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 (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/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" 10 #include "android_webview/browser/aw_contents_client_bridge_base.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 request_url, 357 request_url,
358 callback, 358 callback,
359 &cancel_request); 359 &cancel_request);
360 if (cancel_request) 360 if (cancel_request)
361 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; 361 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
362 } 362 }
363 363
364 void AwContentBrowserClient::SelectClientCertificate( 364 void AwContentBrowserClient::SelectClientCertificate(
365 int render_process_id, 365 int render_process_id,
366 int render_frame_id, 366 int render_frame_id,
367 const net::HttpNetworkSession* network_session,
368 net::SSLCertRequestInfo* cert_request_info, 367 net::SSLCertRequestInfo* cert_request_info,
369 const base::Callback<void(net::X509Certificate*)>& callback) { 368 const base::Callback<void(net::X509Certificate*)>& callback) {
370 AwContentsClientBridgeBase* client = 369 AwContentsClientBridgeBase* client =
371 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); 370 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
372 if (client) { 371 if (client) {
373 client->SelectClientCertificate(cert_request_info, callback); 372 client->SelectClientCertificate(cert_request_info, callback);
374 } else { 373 } else {
375 callback.Run(NULL); 374 callback.Run(NULL);
376 } 375 }
377 } 376 }
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 551 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
553 } 552 }
554 #endif 553 #endif
555 554
556 content::DevToolsManagerDelegate* 555 content::DevToolsManagerDelegate*
557 AwContentBrowserClient::GetDevToolsManagerDelegate() { 556 AwContentBrowserClient::GetDevToolsManagerDelegate() {
558 return new AwDevToolsManagerDelegate(); 557 return new AwDevToolsManagerDelegate();
559 } 558 }
560 559
561 } // namespace android_webview 560 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698