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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 struct WebWindowFeatures; | 51 struct WebWindowFeatures; |
52 } | 52 } |
53 | 53 |
54 namespace gfx { | 54 namespace gfx { |
55 class ImageSkia; | 55 class ImageSkia; |
56 } | 56 } |
57 | 57 |
58 namespace net { | 58 namespace net { |
59 class CookieOptions; | 59 class CookieOptions; |
60 class CookieStore; | 60 class CookieStore; |
| 61 class HttpNetworkSession; |
61 class NetLog; | 62 class NetLog; |
62 class SSLCertRequestInfo; | 63 class SSLCertRequestInfo; |
63 class SSLInfo; | 64 class SSLInfo; |
64 class URLRequest; | 65 class URLRequest; |
65 class URLRequestContext; | 66 class URLRequestContext; |
66 class URLRequestContextGetter; | 67 class URLRequestContextGetter; |
67 class X509Certificate; | 68 class X509Certificate; |
68 } | 69 } |
69 | 70 |
70 namespace sandbox { | 71 namespace sandbox { |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 bool strict_enforcement, | 395 bool strict_enforcement, |
395 bool expired_previous_decision, | 396 bool expired_previous_decision, |
396 const base::Callback<void(bool)>& callback, | 397 const base::Callback<void(bool)>& callback, |
397 CertificateRequestResultType* result) {} | 398 CertificateRequestResultType* result) {} |
398 | 399 |
399 // Selects a SSL client certificate and returns it to the |callback|. If no | 400 // Selects a SSL client certificate and returns it to the |callback|. If no |
400 // certificate was selected NULL is returned to the |callback|. | 401 // certificate was selected NULL is returned to the |callback|. |
401 virtual void SelectClientCertificate( | 402 virtual void SelectClientCertificate( |
402 int render_process_id, | 403 int render_process_id, |
403 int render_frame_id, | 404 int render_frame_id, |
| 405 const net::HttpNetworkSession* network_session, |
404 net::SSLCertRequestInfo* cert_request_info, | 406 net::SSLCertRequestInfo* cert_request_info, |
405 const base::Callback<void(net::X509Certificate*)>& callback); | 407 const base::Callback<void(net::X509Certificate*)>& callback) {} |
406 | 408 |
407 // Adds a new installable certificate or private key. | 409 // Adds a new installable certificate or private key. |
408 // Typically used to install an X.509 user certificate. | 410 // Typically used to install an X.509 user certificate. |
409 // Note that it's up to the embedder to verify that the data is | 411 // Note that it's up to the embedder to verify that the data is |
410 // well-formed. |cert_data| will be NULL if |cert_size| is 0. | 412 // well-formed. |cert_data| will be NULL if |cert_size| is 0. |
411 virtual void AddCertificate(net::CertificateMimeType cert_type, | 413 virtual void AddCertificate(net::CertificateMimeType cert_type, |
412 const void* cert_data, | 414 const void* cert_data, |
413 size_t cert_size, | 415 size_t cert_size, |
414 int render_process_id, | 416 int render_process_id, |
415 int render_frame_id) {} | 417 int render_frame_id) {} |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 // camera. Note that this does not query the user. |type| must be | 625 // camera. Note that this does not query the user. |type| must be |
624 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE. | 626 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE. |
625 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context, | 627 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context, |
626 const GURL& security_origin, | 628 const GURL& security_origin, |
627 MediaStreamType type); | 629 MediaStreamType type); |
628 }; | 630 }; |
629 | 631 |
630 } // namespace content | 632 } // namespace content |
631 | 633 |
632 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 634 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |