| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 int cert_error, | 159 int cert_error, |
| 160 const net::SSLInfo& ssl_info, | 160 const net::SSLInfo& ssl_info, |
| 161 const GURL& request_url, | 161 const GURL& request_url, |
| 162 content::ResourceType resource_type, | 162 content::ResourceType resource_type, |
| 163 bool overridable, | 163 bool overridable, |
| 164 bool strict_enforcement, | 164 bool strict_enforcement, |
| 165 bool expired_previous_decision, | 165 bool expired_previous_decision, |
| 166 const base::Callback<void(bool)>& callback, | 166 const base::Callback<void(bool)>& callback, |
| 167 content::CertificateRequestResultType* request) override; | 167 content::CertificateRequestResultType* request) override; |
| 168 void SelectClientCertificate( | 168 void SelectClientCertificate( |
| 169 int render_process_id, | 169 content::WebContents* web_contents, |
| 170 int render_frame_id, | |
| 171 net::SSLCertRequestInfo* cert_request_info, | 170 net::SSLCertRequestInfo* cert_request_info, |
| 172 const base::Callback<void(net::X509Certificate*)>& callback) override; | 171 scoped_ptr<content::ClientCertificateDelegate> delegate) override; |
| 173 void AddCertificate(net::CertificateMimeType cert_type, | 172 void AddCertificate(net::CertificateMimeType cert_type, |
| 174 const void* cert_data, | 173 const void* cert_data, |
| 175 size_t cert_size, | 174 size_t cert_size, |
| 176 int render_process_id, | 175 int render_process_id, |
| 177 int render_frame_id) override; | 176 int render_frame_id) override; |
| 178 content::MediaObserver* GetMediaObserver() override; | 177 content::MediaObserver* GetMediaObserver() override; |
| 179 content::PlatformNotificationService* GetPlatformNotificationService() | 178 content::PlatformNotificationService* GetPlatformNotificationService() |
| 180 override; | 179 override; |
| 181 void RequestPermission( | 180 void RequestPermission( |
| 182 content::PermissionType permission, | 181 content::PermissionType permission, |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 333 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 335 | 334 |
| 336 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 335 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 337 | 336 |
| 338 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 337 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 339 }; | 338 }; |
| 340 | 339 |
| 341 } // namespace chrome | 340 } // namespace chrome |
| 342 | 341 |
| 343 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 342 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |