| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 int cert_error, | 163 int cert_error, |
| 164 const net::SSLInfo& ssl_info, | 164 const net::SSLInfo& ssl_info, |
| 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 content::WebContents* web_contents, |
| 174 int render_frame_id, | |
| 175 net::SSLCertRequestInfo* cert_request_info, | 174 net::SSLCertRequestInfo* cert_request_info, |
| 176 const base::Callback<void(net::X509Certificate*)>& callback) override; | 175 scoped_ptr<content::ClientCertificateDelegate> delegate) override; |
| 177 void AddCertificate(net::CertificateMimeType cert_type, | 176 void AddCertificate(net::CertificateMimeType cert_type, |
| 178 const void* cert_data, | 177 const void* cert_data, |
| 179 size_t cert_size, | 178 size_t cert_size, |
| 180 int render_process_id, | 179 int render_process_id, |
| 181 int render_frame_id) override; | 180 int render_frame_id) override; |
| 182 content::MediaObserver* GetMediaObserver() override; | 181 content::MediaObserver* GetMediaObserver() override; |
| 183 content::PlatformNotificationService* GetPlatformNotificationService() | 182 content::PlatformNotificationService* GetPlatformNotificationService() |
| 184 override; | 183 override; |
| 185 void RequestPermission( | 184 void RequestPermission( |
| 186 content::PermissionType permission, | 185 content::PermissionType permission, |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 340 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 342 | 341 |
| 343 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 342 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 344 | 343 |
| 345 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 344 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 346 }; | 345 }; |
| 347 | 346 |
| 348 } // namespace chrome | 347 } // namespace chrome |
| 349 | 348 |
| 350 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 349 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |