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

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

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jam review changes Created 7 years 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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 virtual void GetAdditionalMappedFilesForChildProcess( 255 virtual void GetAdditionalMappedFilesForChildProcess(
256 const CommandLine& command_line, 256 const CommandLine& command_line,
257 int child_process_id, 257 int child_process_id,
258 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 258 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
259 #endif 259 #endif
260 #if defined(OS_WIN) 260 #if defined(OS_WIN)
261 virtual const wchar_t* GetResourceDllName() OVERRIDE; 261 virtual const wchar_t* GetResourceDllName() OVERRIDE;
262 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 262 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
263 bool* success) OVERRIDE; 263 bool* success) OVERRIDE;
264 #endif 264 #endif
265 #if defined(USE_NSS)
266 virtual
267 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
268 const GURL& url) OVERRIDE;
269 #endif
270 265
271 virtual bool IsPluginAllowedToCallRequestOSFileHandle( 266 virtual bool IsPluginAllowedToCallRequestOSFileHandle(
272 content::BrowserContext* browser_context, 267 content::BrowserContext* browser_context,
273 const GURL& url) OVERRIDE; 268 const GURL& url) OVERRIDE;
274 269
275 private: 270 private:
276 #if defined(ENABLE_PLUGINS) 271 #if defined(ENABLE_PLUGINS)
277 // 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.
278 std::set<std::string> allowed_socket_origins_; 273 std::set<std::string> allowed_socket_origins_;
279 // Set of origins that can get a handle for FileIO from NaCl. 274 // Set of origins that can get a handle for FileIO from NaCl.
280 std::set<std::string> allowed_file_handle_origins_; 275 std::set<std::string> allowed_file_handle_origins_;
281 #endif 276 #endif
282 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> 277 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
283 permissions_policy_delegate_; 278 permissions_policy_delegate_;
284 279
285 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 280 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
286 }; 281 };
287 282
288 } // namespace chrome 283 } // namespace chrome
289 284
290 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 285 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698