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

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

Issue 596873002: Remove SSLClientAuthHandler's RDH dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Un-refcount, fix cancel cases, remove HttpNetworkSession Created 6 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 (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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 request_url, 377 request_url,
378 callback, 378 callback,
379 &cancel_request); 379 &cancel_request);
380 if (cancel_request) 380 if (cancel_request)
381 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; 381 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
382 } 382 }
383 383
384 void AwContentBrowserClient::SelectClientCertificate( 384 void AwContentBrowserClient::SelectClientCertificate(
385 int render_process_id, 385 int render_process_id,
386 int render_frame_id, 386 int render_frame_id,
387 const net::HttpNetworkSession* network_session,
388 net::SSLCertRequestInfo* cert_request_info, 387 net::SSLCertRequestInfo* cert_request_info,
389 const base::Callback<void(net::X509Certificate*)>& callback) { 388 const base::Callback<void(net::X509Certificate*)>& callback) {
390 AwContentsClientBridgeBase* client = 389 AwContentsClientBridgeBase* client =
391 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); 390 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
392 if (client) { 391 if (client) {
393 client->SelectClientCertificate(cert_request_info, callback); 392 client->SelectClientCertificate(cert_request_info, callback);
394 } else { 393 } else {
395 callback.Run(NULL); 394 callback.Run(NULL);
396 } 395 }
397 } 396 }
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 573
575 #if defined(VIDEO_HOLE) 574 #if defined(VIDEO_HOLE)
576 content::ExternalVideoSurfaceContainer* 575 content::ExternalVideoSurfaceContainer*
577 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 576 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
578 content::WebContents* web_contents) { 577 content::WebContents* web_contents) {
579 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 578 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
580 } 579 }
581 #endif 580 #endif
582 581
583 } // namespace android_webview 582 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698