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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 bool overridable, | 147 bool overridable, |
148 bool strict_enforcement, | 148 bool strict_enforcement, |
149 const base::Callback<void(bool)>& callback, | 149 const base::Callback<void(bool)>& callback, |
150 bool* cancel_request) OVERRIDE; | 150 bool* cancel_request) OVERRIDE; |
151 virtual void SelectClientCertificate( | 151 virtual void SelectClientCertificate( |
152 int render_process_id, | 152 int render_process_id, |
153 int render_view_id, | 153 int render_view_id, |
154 const net::HttpNetworkSession* network_session, | 154 const net::HttpNetworkSession* network_session, |
155 net::SSLCertRequestInfo* cert_request_info, | 155 net::SSLCertRequestInfo* cert_request_info, |
156 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 156 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
157 virtual void AddNewCertificate( | 157 virtual void AddCertificate( |
158 net::URLRequest* request, | 158 net::URLRequest* request, |
159 net::X509Certificate* cert, | 159 net::CertificateType cert_type, |
| 160 const void* cert_data, |
| 161 size_t cert_size, |
160 int render_process_id, | 162 int render_process_id, |
161 int render_view_id) OVERRIDE; | 163 int render_view_id) OVERRIDE; |
162 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; | 164 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; |
163 virtual void RequestDesktopNotificationPermission( | 165 virtual void RequestDesktopNotificationPermission( |
164 const GURL& source_origin, | 166 const GURL& source_origin, |
165 int callback_context, | 167 int callback_context, |
166 int render_process_id, | 168 int render_process_id, |
167 int render_view_id) OVERRIDE; | 169 int render_view_id) OVERRIDE; |
168 virtual WebKit::WebNotificationPresenter::Permission | 170 virtual WebKit::WebNotificationPresenter::Permission |
169 CheckDesktopNotificationPermission( | 171 CheckDesktopNotificationPermission( |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 // Cached version of the locale so we can return the locale on the I/O | 255 // Cached version of the locale so we can return the locale on the I/O |
254 // thread. | 256 // thread. |
255 std::string io_thread_application_locale_; | 257 std::string io_thread_application_locale_; |
256 | 258 |
257 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 259 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
258 }; | 260 }; |
259 | 261 |
260 } // namespace chrome | 262 } // namespace chrome |
261 | 263 |
262 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 264 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |