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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/user_manager.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: Chrome, webkit, remoting and crypto/owners 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/chromeos/login/signed_settings_unittest.cc ('k') | chrome/browser/download/base_file.h » ('j') | crypto/crypto.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager.cc
===================================================================
--- chrome/browser/chromeos/login/user_manager.cc (revision 80873)
+++ chrome/browser/chromeos/login/user_manager.cc (working copy)
@@ -10,13 +10,13 @@
#include "base/file_util.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "crypto/nss_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/cryptohome_library.h"
@@ -570,7 +570,7 @@
// Let the window manager know that we're logged in now.
WmIpc::instance()->SetLoggedInProperty(true);
// Ensure we've opened the real user's key/certificate database.
- base::OpenPersistentNSSDB();
+ crypto::OpenPersistentNSSDB();
// Only load the Opencryptoki library into NSS if we have this switch.
// TODO(gspencer): Remove this switch once cryptohomed work is finished:
« no previous file with comments | « chrome/browser/chromeos/login/signed_settings_unittest.cc ('k') | chrome/browser/download/base_file.h » ('j') | crypto/crypto.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698