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

Unified Diff: chrome/browser/importer/nss_decryptor.cc

Issue 199105: Continue with the FreeBSD port - this version builds and links, though... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 3 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/importer/nss_decryptor.h ('k') | chrome/browser/jankometer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/nss_decryptor.cc
===================================================================
--- chrome/browser/importer/nss_decryptor.cc (revision 25977)
+++ chrome/browser/importer/nss_decryptor.cc (working copy)
@@ -8,10 +8,10 @@
#include "build/build_config.h"
#include "chrome/common/sqlite_utils.h"
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
#include <pk11pub.h>
#include <pk11sdr.h>
-#endif // defined(OS_LINUX)
+#endif // defined(USE_NSS)
#include "base/string_util.h"
#include "net/base/base64.h"
@@ -84,11 +84,11 @@
SECItem reply;
reply.data = NULL;
reply.len = 0;
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
result = PK11SDR_DecryptWithSlot(slot, &request, &reply, NULL);
#else
result = PK11SDR_Decrypt(&request, &reply, NULL);
-#endif // defined(OS_LINUX)
+#endif // defined(USE_NSS)
if (result == SECSuccess)
plain.assign(reinterpret_cast<char*>(reply.data), reply.len);
« no previous file with comments | « chrome/browser/importer/nss_decryptor.h ('k') | chrome/browser/jankometer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698