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

Unified Diff: chrome/browser/ui/crypto_module_password_dialog_nss.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/crypto_module_password_dialog.h ('k') | chrome/browser/ui/gtk/certificate_viewer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/crypto_module_password_dialog_nss.cc
===================================================================
--- chrome/browser/ui/crypto_module_password_dialog_nss.cc (revision 81350)
+++ chrome/browser/ui/crypto_module_password_dialog_nss.cc (working copy)
@@ -12,7 +12,7 @@
#include "net/base/x509_certificate.h"
#if defined(OS_CHROMEOS)
-#include "base/nss_util.h"
+#include "crypto/nss_util.h"
#endif
namespace {
@@ -66,11 +66,11 @@
for (; current_ < modules_.size(); ++current_) {
if (ShouldShowDialog(modules_[current_].get())) {
#if defined(OS_CHROMEOS)
- if (modules_[current_]->GetTokenName() == base::GetTPMTokenName()) {
+ if (modules_[current_]->GetTokenName() == crypto::GetTPMTokenName()) {
// The user PIN is a well known secret on this machine, and
// the user didn't set it, so we need to fetch the value and
// supply it for them here.
- GotPassword(base::GetTPMUserPIN().c_str());
+ GotPassword(crypto::GetTPMUserPIN().c_str());
return;
}
#endif
« no previous file with comments | « chrome/browser/ui/crypto_module_password_dialog.h ('k') | chrome/browser/ui/gtk/certificate_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698