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

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: cleanups, add test for chrome keygen class Created 7 years, 3 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 const net::HttpNetworkSession* network_session, 168 const net::HttpNetworkSession* network_session,
169 net::SSLCertRequestInfo* cert_request_info, 169 net::SSLCertRequestInfo* cert_request_info,
170 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 170 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
171 virtual void AddCertificate( 171 virtual void AddCertificate(
172 net::URLRequest* request, 172 net::URLRequest* request,
173 net::CertificateMimeType cert_type, 173 net::CertificateMimeType cert_type,
174 const void* cert_data, 174 const void* cert_data,
175 size_t cert_size, 175 size_t cert_size,
176 int render_process_id, 176 int render_process_id,
177 int render_view_id) OVERRIDE; 177 int render_view_id) OVERRIDE;
178 virtual void Keygen(
Ryan Sleevi 2013/10/09 19:18:00 Keygen in this context sounds like a noun. Should
mattm 2013/10/09 23:52:38 will do.
179 content::ResourceContext* context,
180 int key_size_in_bits,
181 const std::string& challenge,
182 const GURL& url,
183 const base::Callback<void(const std::string*)>& callback) OVERRIDE;
178 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; 184 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
179 virtual void RequestDesktopNotificationPermission( 185 virtual void RequestDesktopNotificationPermission(
180 const GURL& source_origin, 186 const GURL& source_origin,
181 int callback_context, 187 int callback_context,
182 int render_process_id, 188 int render_process_id,
183 int render_view_id) OVERRIDE; 189 int render_view_id) OVERRIDE;
184 virtual WebKit::WebNotificationPresenter::Permission 190 virtual WebKit::WebNotificationPresenter::Permission
185 CheckDesktopNotificationPermission( 191 CheckDesktopNotificationPermission(
186 const GURL& source_origin, 192 const GURL& source_origin,
187 content::ResourceContext* context, 193 content::ResourceContext* context,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 virtual void GetAdditionalMappedFilesForChildProcess( 259 virtual void GetAdditionalMappedFilesForChildProcess(
254 const CommandLine& command_line, 260 const CommandLine& command_line,
255 int child_process_id, 261 int child_process_id,
256 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 262 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
257 #endif 263 #endif
258 #if defined(OS_WIN) 264 #if defined(OS_WIN)
259 virtual const wchar_t* GetResourceDllName() OVERRIDE; 265 virtual const wchar_t* GetResourceDllName() OVERRIDE;
260 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 266 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
261 bool* success) OVERRIDE; 267 bool* success) OVERRIDE;
262 #endif 268 #endif
263 #if defined(USE_NSS)
264 virtual
265 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
266 const GURL& url) OVERRIDE;
267 #endif
268 269
269 private: 270 private:
270 #if defined(ENABLE_PLUGINS) 271 #if defined(ENABLE_PLUGINS)
271 // Set of origins that can use TCP/UDP private APIs from NaCl. 272 // Set of origins that can use TCP/UDP private APIs from NaCl.
272 std::set<std::string> allowed_socket_origins_; 273 std::set<std::string> allowed_socket_origins_;
273 #endif 274 #endif
274 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> 275 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
275 permissions_policy_delegate_; 276 permissions_policy_delegate_;
276 277
277 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 278 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
278 }; 279 };
279 280
280 } // namespace chrome 281 } // namespace chrome
281 282
282 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 283 #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') | content/browser/renderer_host/render_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698