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

Side by Side Diff: chromecast/browser/cast_content_browser_client.cc

Issue 782293005: Revert "Chromecast buildfix: update SelectClientCertificate API." (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
« no previous file with comments | « chromecast/browser/cast_content_browser_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/scoped_file.h" 8 #include "base/files/scoped_file.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 content::CertificateRequestResultType* result) { 145 content::CertificateRequestResultType* result) {
146 // Allow developers to override certificate errors. 146 // Allow developers to override certificate errors.
147 // Otherwise, any fatal certificate errors will cause an abort. 147 // Otherwise, any fatal certificate errors will cause an abort.
148 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL; 148 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
149 return; 149 return;
150 } 150 }
151 151
152 void CastContentBrowserClient::SelectClientCertificate( 152 void CastContentBrowserClient::SelectClientCertificate(
153 int render_process_id, 153 int render_process_id,
154 int render_view_id, 154 int render_view_id,
155 const net::HttpNetworkSession* network_session,
156 net::SSLCertRequestInfo* cert_request_info, 155 net::SSLCertRequestInfo* cert_request_info,
157 const base::Callback<void(net::X509Certificate*)>& callback) { 156 const base::Callback<void(net::X509Certificate*)>& callback) {
158 GURL requesting_url("https://" + cert_request_info->host_and_port.ToString()); 157 GURL requesting_url("https://" + cert_request_info->host_and_port.ToString());
159 158
160 if (!requesting_url.is_valid()) { 159 if (!requesting_url.is_valid()) {
161 LOG(ERROR) << "Invalid URL string: " 160 LOG(ERROR) << "Invalid URL string: "
162 << requesting_url.possibly_invalid_spec(); 161 << requesting_url.possibly_invalid_spec();
163 callback.Run(NULL); 162 callback.Run(NULL);
164 return; 163 return;
165 } 164 }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 content::ExternalVideoSurfaceContainer* 261 content::ExternalVideoSurfaceContainer*
263 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 262 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
264 content::WebContents* web_contents) { 263 content::WebContents* web_contents) {
265 return new ExternalVideoSurfaceContainerImpl(web_contents); 264 return new ExternalVideoSurfaceContainerImpl(web_contents);
266 } 265 }
267 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) 266 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE)
268 267
269 268
270 } // namespace shell 269 } // namespace shell
271 } // namespace chromecast 270 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/cast_content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698