chrome/utility/importer/nss_decryptor.h - Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/utility/importer/nss_decryptor.h

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs

Patch Set: rebase Created 5 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 unified diff | Download patch

« no previous file with comments | « chrome/renderer/chrome_render_process_observer.cc ('k') | chrome/utility/importer/nss_decryptor.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_	5 #ifndef CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_

6 #define CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_	6 #define CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_

7	7

8 #include "build/build_config.h"	8 #include "build/build_config.h"

9	9

10 #if defined(OS_MACOSX)	10 #if defined(OS_MACOSX)

11 #include "chrome/utility/importer/nss_decryptor_mac.h"	11 #include "chrome/utility/importer/nss_decryptor_mac.h"

12 #elif defined(OS_WIN)	12 #elif defined(OS_WIN)

13 #include "chrome/utility/importer/nss_decryptor_win.h"	13 #include "chrome/utility/importer/nss_decryptor_win.h"

14 #elif defined(USE_OPENSSL)	14 #elif defined(USE_OPENSSL)

15 // TODO(joth): It should be an error to include this file with USE_OPENSSL	15 // TODO(joth): It should be an error to include this file with USE_OPENSSL

16 // defined. (Unless there is a way to do nss decrypt with OpenSSL). Ideally	16 // defined. (Unless there is a way to do nss decrypt with OpenSSL). Ideally

17 // we remove the importers that depend on NSS when doing USE_OPENSSL builds, but	17 // we remove the importers that depend on NSS when doing USE_OPENSSL builds, but

18 // that is going to take some non-trivial refactoring so in the meantime we're	18 // that is going to take some non-trivial refactoring so in the meantime we're

19 // just falling back to a no-op implementation.	19 // just falling back to a no-op implementation.

20 #include "chrome/utility/importer/nss_decryptor_null.h"	20 #include "chrome/utility/importer/nss_decryptor_null.h"

21 #elif defined(USE_NSS)	21 #elif defined(USE_NSS_CERTS)

22 #include "chrome/utility/importer/nss_decryptor_system_nss.h"	22 #include "chrome/utility/importer/nss_decryptor_system_nss.h"

23 #endif	23 #endif

24	24

25 #endif // CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_	25 #endif // CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_

OLD	NEW