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

Unified Diff: chrome/browser/browser_main_win.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/browser_main_mac.mm ('k') | chrome/browser/chromeos/login/google_authenticator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main_win.cc
===================================================================
--- chrome/browser/browser_main_win.cc (revision 81350)
+++ chrome/browser/browser_main_win.cc (working copy)
@@ -15,11 +15,11 @@
#include "base/i18n/rtl.h"
#include "base/memory/scoped_native_library.h"
#include "base/memory/scoped_ptr.h"
-#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/utf_string_conversions.h"
#include "base/win/windows_version.h"
#include "base/win/wrapped_window_proc.h"
+#include "crypto/nss_util.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/first_run/upgrade.h"
#include "chrome/browser/metrics/metrics_service.h"
@@ -295,7 +295,7 @@
net::ClientSocketFactory::UseSystemSSL();
} else {
// We want to be sure to init NSPR on the main thread.
- base::EnsureNSPRInit();
+ crypto::EnsureNSPRInit();
}
}
};
« no previous file with comments | « chrome/browser/browser_main_mac.mm ('k') | chrome/browser/chromeos/login/google_authenticator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698