diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/importer/nss_decryptor.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/importer/nss_decryptor.h')
| -rw-r--r-- | chrome/browser/importer/nss_decryptor.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/importer/nss_decryptor.h b/chrome/browser/importer/nss_decryptor.h index 8361d17..9896a14 100644 --- a/chrome/browser/importer/nss_decryptor.h +++ b/chrome/browser/importer/nss_decryptor.h @@ -12,6 +12,13 @@ #include "chrome/browser/importer/nss_decryptor_mac.h" #elif defined(OS_WIN) #include "chrome/browser/importer/nss_decryptor_win.h" +#elif defined(USE_OPENSSL) +// TODO(joth): It should be an error to include this file with USE_OPENSSL +// defined. (Unless there is a way to do nss decrypt with OpenSSL). Ideally +// we remove the importers that depend on NSS when doing USE_OPENSSL builds, but +// that is going to take some non-trivial refactoring so in the meantime we're +// just falling back to a no-op implementation. +#include "chrome/browser/importer/nss_decryptor_null.h" #elif defined(USE_NSS) #include "chrome/browser/importer/nss_decryptor_system_nss.h" #endif |