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

Unified 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: unit_test compile fix 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 side-by-side diff with in-line comments
Download patch
Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index aae30ebc5c45ab90852a39084d160d48d0b602fa..7fdca6740da08bbab8dd68ed65b78dcee546be7c 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -44,7 +44,7 @@ class DictionaryValue;
class FilePath;
}
namespace crypto {
-class CryptoModuleBlockingPasswordDelegate;
+class NSSCryptoModuleDelegate;
jam 2013/12/12 06:42:50 nit: not used
mattm 2013/12/12 21:49:18 Done.
}
namespace gfx {
@@ -605,14 +605,6 @@ class CONTENT_EXPORT ContentBrowserClient {
bool* success) {}
#endif
-#if defined(USE_NSS)
- // Return a delegate to authenticate and unlock |module|.
- // This is called on a worker thread.
- virtual
- crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
- const GURL& url);
-#endif
-
// Returns true if plugin referred to by the url can use
// pp::FileIO::RequestOSFileHandle.
virtual bool IsPluginAllowedToCallRequestOSFileHandle(

Powered by Google App Engine
This is Rietveld 408576698