Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 const net::HttpNetworkSession* network_session, 166 const net::HttpNetworkSession* network_session,
167 net::SSLCertRequestInfo* cert_request_info, 167 net::SSLCertRequestInfo* cert_request_info,
168 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 168 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
169 virtual void AddCertificate( 169 virtual void AddCertificate(
170 net::URLRequest* request, 170 net::URLRequest* request,
171 net::CertificateMimeType cert_type, 171 net::CertificateMimeType cert_type,
172 const void* cert_data, 172 const void* cert_data,
173 size_t cert_size, 173 size_t cert_size,
174 int render_process_id, 174 int render_process_id,
175 int render_view_id) OVERRIDE; 175 int render_view_id) OVERRIDE;
176 virtual void Keygen(
177 content::ResourceContext* context,
178 int key_size_in_bits,
179 const std::string& challenge,
180 const GURL& url,
181 const base::Callback<void(const std::string*)>& callback) OVERRIDE;
176 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; 182 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
177 virtual void RequestDesktopNotificationPermission( 183 virtual void RequestDesktopNotificationPermission(
178 const GURL& source_origin, 184 const GURL& source_origin,
179 int callback_context, 185 int callback_context,
180 int render_process_id, 186 int render_process_id,
181 int render_view_id) OVERRIDE; 187 int render_view_id) OVERRIDE;
182 virtual WebKit::WebNotificationPresenter::Permission 188 virtual WebKit::WebNotificationPresenter::Permission
183 CheckDesktopNotificationPermission( 189 CheckDesktopNotificationPermission(
184 const GURL& source_origin, 190 const GURL& source_origin,
185 content::ResourceContext* context, 191 content::ResourceContext* context,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 virtual void GetAdditionalMappedFilesForChildProcess( 253 virtual void GetAdditionalMappedFilesForChildProcess(
248 const CommandLine& command_line, 254 const CommandLine& command_line,
249 int child_process_id, 255 int child_process_id,
250 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 256 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
251 #endif 257 #endif
252 #if defined(OS_WIN) 258 #if defined(OS_WIN)
253 virtual const wchar_t* GetResourceDllName() OVERRIDE; 259 virtual const wchar_t* GetResourceDllName() OVERRIDE;
254 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 260 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
255 bool* success) OVERRIDE; 261 bool* success) OVERRIDE;
256 #endif 262 #endif
257 #if defined(USE_NSS)
258 virtual
259 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
260 const GURL& url) OVERRIDE;
261 #endif
262 263
263 private: 264 private:
264 #if defined(ENABLE_PLUGINS) 265 #if defined(ENABLE_PLUGINS)
265 // Set of origins that can use TCP/UDP private APIs from NaCl. 266 // Set of origins that can use TCP/UDP private APIs from NaCl.
266 std::set<std::string> allowed_socket_origins_; 267 std::set<std::string> allowed_socket_origins_;
267 #endif 268 #endif
268 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> 269 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
269 permissions_policy_delegate_; 270 permissions_policy_delegate_;
270 271
271 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 272 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
272 }; 273 };
273 274
274 } // namespace chrome 275 } // namespace chrome
275 276
276 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 277 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | net/cert/cert_verify_proc_nss.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698