| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 net::SSLCertRequestInfo* cert_request_info, | 146 net::SSLCertRequestInfo* cert_request_info, |
| 147 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 147 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
| 148 virtual void AddCertificate( | 148 virtual void AddCertificate( |
| 149 net::URLRequest* request, | 149 net::URLRequest* request, |
| 150 net::CertificateMimeType cert_type, | 150 net::CertificateMimeType cert_type, |
| 151 const void* cert_data, | 151 const void* cert_data, |
| 152 size_t cert_size, | 152 size_t cert_size, |
| 153 int render_process_id, | 153 int render_process_id, |
| 154 int render_view_id) OVERRIDE; | 154 int render_view_id) OVERRIDE; |
| 155 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; | 155 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; |
| 156 virtual content::WebRTCInternalsInterface* |
| 157 GetWebRTCInternalsInterface() OVERRIDE; |
| 156 virtual void RequestDesktopNotificationPermission( | 158 virtual void RequestDesktopNotificationPermission( |
| 157 const GURL& source_origin, | 159 const GURL& source_origin, |
| 158 int callback_context, | 160 int callback_context, |
| 159 int render_process_id, | 161 int render_process_id, |
| 160 int render_view_id) OVERRIDE; | 162 int render_view_id) OVERRIDE; |
| 161 virtual WebKit::WebNotificationPresenter::Permission | 163 virtual WebKit::WebNotificationPresenter::Permission |
| 162 CheckDesktopNotificationPermission( | 164 CheckDesktopNotificationPermission( |
| 163 const GURL& source_origin, | 165 const GURL& source_origin, |
| 164 content::ResourceContext* context, | 166 content::ResourceContext* context, |
| 165 int render_process_id) OVERRIDE; | 167 int render_process_id) OVERRIDE; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 // Cached version of the locale so we can return the locale on the I/O | 247 // Cached version of the locale so we can return the locale on the I/O |
| 246 // thread. | 248 // thread. |
| 247 std::string io_thread_application_locale_; | 249 std::string io_thread_application_locale_; |
| 248 | 250 |
| 249 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 251 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 250 }; | 252 }; |
| 251 | 253 |
| 252 } // namespace chrome | 254 } // namespace chrome |
| 253 | 255 |
| 254 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 256 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |