OLD | NEW |
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 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 // CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE, the request will be cancelled | 385 // CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE, the request will be cancelled |
386 // or denied immediately, and the callback won't be run. | 386 // or denied immediately, and the callback won't be run. |
387 virtual void AllowCertificateError(int render_process_id, | 387 virtual void AllowCertificateError(int render_process_id, |
388 int render_frame_id, | 388 int render_frame_id, |
389 int cert_error, | 389 int cert_error, |
390 const net::SSLInfo& ssl_info, | 390 const net::SSLInfo& ssl_info, |
391 const GURL& request_url, | 391 const GURL& request_url, |
392 ResourceType resource_type, | 392 ResourceType resource_type, |
393 bool overridable, | 393 bool overridable, |
394 bool strict_enforcement, | 394 bool strict_enforcement, |
| 395 bool expired_previous_decision, |
395 const base::Callback<void(bool)>& callback, | 396 const base::Callback<void(bool)>& callback, |
396 CertificateRequestResultType* result) {} | 397 CertificateRequestResultType* result) {} |
397 | 398 |
398 // Selects a SSL client certificate and returns it to the |callback|. If no | 399 // Selects a SSL client certificate and returns it to the |callback|. If no |
399 // certificate was selected NULL is returned to the |callback|. | 400 // certificate was selected NULL is returned to the |callback|. |
400 virtual void SelectClientCertificate( | 401 virtual void SelectClientCertificate( |
401 int render_process_id, | 402 int render_process_id, |
402 int render_frame_id, | 403 int render_frame_id, |
403 const net::HttpNetworkSession* network_session, | 404 const net::HttpNetworkSession* network_session, |
404 net::SSLCertRequestInfo* cert_request_info, | 405 net::SSLCertRequestInfo* cert_request_info, |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
653 // Allows an embedder to provide its own ExternalVideoSurfaceContainer | 654 // Allows an embedder to provide its own ExternalVideoSurfaceContainer |
654 // implementation. Return NULL to disable external surface video. | 655 // implementation. Return NULL to disable external surface video. |
655 virtual ExternalVideoSurfaceContainer* | 656 virtual ExternalVideoSurfaceContainer* |
656 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); | 657 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); |
657 #endif | 658 #endif |
658 }; | 659 }; |
659 | 660 |
660 } // namespace content | 661 } // namespace content |
661 | 662 |
662 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 663 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |