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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 const GURL& request_url, | 166 const GURL& request_url, |
167 content::ResourceType resource_type, | 167 content::ResourceType resource_type, |
168 bool overridable, | 168 bool overridable, |
169 bool strict_enforcement, | 169 bool strict_enforcement, |
170 bool expired_previous_decision, | 170 bool expired_previous_decision, |
171 const base::Callback<void(bool)>& callback, | 171 const base::Callback<void(bool)>& callback, |
172 content::CertificateRequestResultType* request) OVERRIDE; | 172 content::CertificateRequestResultType* request) OVERRIDE; |
173 virtual void SelectClientCertificate( | 173 virtual void SelectClientCertificate( |
174 int render_process_id, | 174 int render_process_id, |
175 int render_frame_id, | 175 int render_frame_id, |
| 176 const net::HttpNetworkSession* network_session, |
176 net::SSLCertRequestInfo* cert_request_info, | 177 net::SSLCertRequestInfo* cert_request_info, |
177 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 178 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
178 virtual void AddCertificate(net::CertificateMimeType cert_type, | 179 virtual void AddCertificate(net::CertificateMimeType cert_type, |
179 const void* cert_data, | 180 const void* cert_data, |
180 size_t cert_size, | 181 size_t cert_size, |
181 int render_process_id, | 182 int render_process_id, |
182 int render_frame_id) OVERRIDE; | 183 int render_frame_id) OVERRIDE; |
183 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; | 184 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; |
184 virtual void RequestDesktopNotificationPermission( | 185 virtual void RequestDesktopNotificationPermission( |
185 const GURL& source_origin, | 186 const GURL& source_origin, |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 352 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
352 | 353 |
353 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 354 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
354 | 355 |
355 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 356 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
356 }; | 357 }; |
357 | 358 |
358 } // namespace chrome | 359 } // namespace chrome |
359 | 360 |
360 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 361 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |