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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 CreateQuotaPermissionContext() OVERRIDE; | 164 CreateQuotaPermissionContext() OVERRIDE; |
165 virtual void AllowCertificateError( | 165 virtual void AllowCertificateError( |
166 int render_process_id, | 166 int render_process_id, |
167 int render_frame_id, | 167 int render_frame_id, |
168 int cert_error, | 168 int cert_error, |
169 const net::SSLInfo& ssl_info, | 169 const net::SSLInfo& ssl_info, |
170 const GURL& request_url, | 170 const GURL& request_url, |
171 content::ResourceType resource_type, | 171 content::ResourceType resource_type, |
172 bool overridable, | 172 bool overridable, |
173 bool strict_enforcement, | 173 bool strict_enforcement, |
| 174 bool expired_previous_decision, |
174 const base::Callback<void(bool)>& callback, | 175 const base::Callback<void(bool)>& callback, |
175 content::CertificateRequestResultType* request) OVERRIDE; | 176 content::CertificateRequestResultType* request) OVERRIDE; |
176 virtual void SelectClientCertificate( | 177 virtual void SelectClientCertificate( |
177 int render_process_id, | 178 int render_process_id, |
178 int render_frame_id, | 179 int render_frame_id, |
179 const net::HttpNetworkSession* network_session, | 180 const net::HttpNetworkSession* network_session, |
180 net::SSLCertRequestInfo* cert_request_info, | 181 net::SSLCertRequestInfo* cert_request_info, |
181 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 182 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
182 virtual void AddCertificate(net::CertificateMimeType cert_type, | 183 virtual void AddCertificate(net::CertificateMimeType cert_type, |
183 const void* cert_data, | 184 const void* cert_data, |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 354 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
354 | 355 |
355 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 356 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
356 | 357 |
357 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 358 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
358 }; | 359 }; |
359 | 360 |
360 } // namespace chrome | 361 } // namespace chrome |
361 | 362 |
362 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 363 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |