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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 struct WebWindowFeatures; | 50 struct WebWindowFeatures; |
51 } | 51 } |
52 | 52 |
53 namespace gfx { | 53 namespace gfx { |
54 class ImageSkia; | 54 class ImageSkia; |
55 } | 55 } |
56 | 56 |
57 namespace net { | 57 namespace net { |
58 class CookieOptions; | 58 class CookieOptions; |
59 class CookieStore; | 59 class CookieStore; |
| 60 class HttpNetworkSession; |
60 class NetLog; | 61 class NetLog; |
61 class SSLCertRequestInfo; | 62 class SSLCertRequestInfo; |
62 class SSLInfo; | 63 class SSLInfo; |
63 class URLRequest; | 64 class URLRequest; |
64 class URLRequestContext; | 65 class URLRequestContext; |
65 class URLRequestContextGetter; | 66 class URLRequestContextGetter; |
66 class X509Certificate; | 67 class X509Certificate; |
67 } | 68 } |
68 | 69 |
69 namespace sandbox { | 70 namespace sandbox { |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 bool strict_enforcement, | 387 bool strict_enforcement, |
387 bool expired_previous_decision, | 388 bool expired_previous_decision, |
388 const base::Callback<void(bool)>& callback, | 389 const base::Callback<void(bool)>& callback, |
389 CertificateRequestResultType* result) {} | 390 CertificateRequestResultType* result) {} |
390 | 391 |
391 // Selects a SSL client certificate and returns it to the |callback|. If no | 392 // Selects a SSL client certificate and returns it to the |callback|. If no |
392 // certificate was selected NULL is returned to the |callback|. | 393 // certificate was selected NULL is returned to the |callback|. |
393 virtual void SelectClientCertificate( | 394 virtual void SelectClientCertificate( |
394 int render_process_id, | 395 int render_process_id, |
395 int render_frame_id, | 396 int render_frame_id, |
| 397 const net::HttpNetworkSession* network_session, |
396 net::SSLCertRequestInfo* cert_request_info, | 398 net::SSLCertRequestInfo* cert_request_info, |
397 const base::Callback<void(net::X509Certificate*)>& callback); | 399 const base::Callback<void(net::X509Certificate*)>& callback) {} |
398 | 400 |
399 // Adds a new installable certificate or private key. | 401 // Adds a new installable certificate or private key. |
400 // Typically used to install an X.509 user certificate. | 402 // Typically used to install an X.509 user certificate. |
401 // Note that it's up to the embedder to verify that the data is | 403 // Note that it's up to the embedder to verify that the data is |
402 // well-formed. |cert_data| will be NULL if |cert_size| is 0. | 404 // well-formed. |cert_data| will be NULL if |cert_size| is 0. |
403 virtual void AddCertificate(net::CertificateMimeType cert_type, | 405 virtual void AddCertificate(net::CertificateMimeType cert_type, |
404 const void* cert_data, | 406 const void* cert_data, |
405 size_t cert_size, | 407 size_t cert_size, |
406 int render_process_id, | 408 int render_process_id, |
407 int render_frame_id) {} | 409 int render_frame_id) {} |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
645 // camera. Note that this does not query the user. |type| must be | 647 // camera. Note that this does not query the user. |type| must be |
646 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE. | 648 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE. |
647 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context, | 649 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context, |
648 const GURL& security_origin, | 650 const GURL& security_origin, |
649 MediaStreamType type); | 651 MediaStreamType type); |
650 }; | 652 }; |
651 | 653 |
652 } // namespace content | 654 } // namespace content |
653 | 655 |
654 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 656 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |