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