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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to 238776 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: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index e6295a4b5b7cff79b8ea6951470ab7b75a41ed57..c4987e3bd33945445a4c173ee8958847c886198c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -188,10 +188,6 @@
#include "ui/gfx/android/device_display_info.h"
#endif
-#if defined(USE_NSS)
-#include "chrome/browser/ui/crypto_module_password_dialog.h"
-#endif
-
#if !defined(OS_CHROMEOS)
#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/signin_manager_factory.h"
@@ -2620,15 +2616,6 @@ void ChromeContentBrowserClient::PreSpawnRenderer(
}
#endif
-#if defined(USE_NSS)
-crypto::CryptoModuleBlockingPasswordDelegate*
- ChromeContentBrowserClient::GetCryptoPasswordDelegate(
- const GURL& url) {
- return chrome::NewCryptoModuleBlockingDialogDelegate(
- chrome::kCryptoModulePasswordKeygen, url.host());
-}
-#endif
-
bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
content::BrowserContext* browser_context,
const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698