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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 const GURL& request_url, | 165 const GURL& request_url, |
166 content::ResourceType resource_type, | 166 content::ResourceType resource_type, |
167 bool overridable, | 167 bool overridable, |
168 bool strict_enforcement, | 168 bool strict_enforcement, |
169 bool expired_previous_decision, | 169 bool expired_previous_decision, |
170 const base::Callback<void(bool)>& callback, | 170 const base::Callback<void(bool)>& callback, |
171 content::CertificateRequestResultType* request) override; | 171 content::CertificateRequestResultType* request) override; |
172 void SelectClientCertificate( | 172 void SelectClientCertificate( |
173 int render_process_id, | 173 int render_process_id, |
174 int render_frame_id, | 174 int render_frame_id, |
| 175 const net::HttpNetworkSession* network_session, |
175 net::SSLCertRequestInfo* cert_request_info, | 176 net::SSLCertRequestInfo* cert_request_info, |
176 const base::Callback<void(net::X509Certificate*)>& callback) override; | 177 const base::Callback<void(net::X509Certificate*)>& callback) override; |
177 void AddCertificate(net::CertificateMimeType cert_type, | 178 void AddCertificate(net::CertificateMimeType cert_type, |
178 const void* cert_data, | 179 const void* cert_data, |
179 size_t cert_size, | 180 size_t cert_size, |
180 int render_process_id, | 181 int render_process_id, |
181 int render_frame_id) override; | 182 int render_frame_id) override; |
182 content::MediaObserver* GetMediaObserver() override; | 183 content::MediaObserver* GetMediaObserver() override; |
183 blink::WebNotificationPermission CheckDesktopNotificationPermission( | 184 blink::WebNotificationPermission CheckDesktopNotificationPermission( |
184 const GURL& source_origin, | 185 const GURL& source_origin, |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 332 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
332 | 333 |
333 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 334 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
334 | 335 |
335 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 336 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
336 }; | 337 }; |
337 | 338 |
338 } // namespace chrome | 339 } // namespace chrome |
339 | 340 |
340 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 341 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |