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

Side by Side Diff: content/public/browser/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: sync to r235279 Created 7 years, 1 month 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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 26 matching lines...) Expand all
37 37
38 namespace blink { 38 namespace blink {
39 struct WebWindowFeatures; 39 struct WebWindowFeatures;
40 } 40 }
41 41
42 namespace base { 42 namespace base {
43 class DictionaryValue; 43 class DictionaryValue;
44 class FilePath; 44 class FilePath;
45 } 45 }
46 namespace crypto { 46 namespace crypto {
47 class CryptoModuleBlockingPasswordDelegate; 47 class NSSCryptoModuleDelegate;
48 } 48 }
49 49
50 namespace gfx { 50 namespace gfx {
51 class ImageSkia; 51 class ImageSkia;
52 } 52 }
53 53
54 namespace net { 54 namespace net {
55 class CookieOptions; 55 class CookieOptions;
56 class HttpNetworkSession; 56 class HttpNetworkSession;
57 class NetLog; 57 class NetLog;
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 virtual const wchar_t* GetResourceDllName(); 585 virtual const wchar_t* GetResourceDllName();
586 586
587 // This is called on the PROCESS_LAUNCHER thread before the renderer process 587 // This is called on the PROCESS_LAUNCHER thread before the renderer process
588 // is launched. It gives the embedder a chance to add loosen the sandbox 588 // is launched. It gives the embedder a chance to add loosen the sandbox
589 // policy. 589 // policy.
590 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 590 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
591 bool* success) {} 591 bool* success) {}
592 #endif 592 #endif
593 593
594 #if defined(USE_NSS) 594 #if defined(USE_NSS)
595 // Return a delegate to authenticate and unlock |module|. 595 // Return a delegate to select a module for keygen and to authenticate and
596 // This is called on a worker thread. 596 // unlock it. This is called on the IO thread.
597 virtual 597 virtual crypto::NSSCryptoModuleDelegate* GetKeygenCryptoModuleDelegate(
598 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 598 ResourceContext* context,
599 const GURL& url); 599 const GURL& url);
600 #endif 600 #endif
601 601
602 // Returns true if plugin referred to by the url can use 602 // Returns true if plugin referred to by the url can use
603 // pp::FileIO::RequestOSFileHandle. 603 // pp::FileIO::RequestOSFileHandle.
604 virtual bool IsPluginAllowedToCallRequestOSFileHandle( 604 virtual bool IsPluginAllowedToCallRequestOSFileHandle(
605 content::BrowserContext* browser_context, 605 content::BrowserContext* browser_context,
606 const GURL& url); 606 const GURL& url);
607 }; 607 };
608 608
609 } // namespace content 609 } // namespace content
610 610
611 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 611 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698