chrome/browser/importer/nss_decryptor.h - Issue 3855004: Make USE_OPENSSL and USE_NSS mutually exclusive

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/browser/importer/nss_decryptor.h

Issue 3855004: Make USE_OPENSSL and USE_NSS mutually exclusive (Closed)

Patch Set: wtc comments Created 10 years, 2 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

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_BROWSER_IMPORTER_NSS_DECRYPTOR_H_	5 #ifndef CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_

6 #define CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_	6 #define CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_

7 #pragma once	7 #pragma once

8	8

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

10	10

11 #if defined(OS_MACOSX)	11 #if defined(OS_MACOSX)

12 #include "chrome/browser/importer/nss_decryptor_mac.h"	12 #include "chrome/browser/importer/nss_decryptor_mac.h"

13 #elif defined(OS_WIN)	13 #elif defined(OS_WIN)

14 #include "chrome/browser/importer/nss_decryptor_win.h"	14 #include "chrome/browser/importer/nss_decryptor_win.h"

	15 #elif defined(USE_OPENSSL)

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

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

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

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

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

	21 #include "chrome/browser/importer/nss_decryptor_null.h"

15 #elif defined(USE_NSS)	22 #elif defined(USE_NSS)

16 #include "chrome/browser/importer/nss_decryptor_system_nss.h"	23 #include "chrome/browser/importer/nss_decryptor_system_nss.h"

17 #endif	24 #endif

18	25

19 #endif // CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_	26 #endif // CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_

OLD	NEW

« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_handler.cc ('k') | chrome/browser/importer/nss_decryptor_null.h » ('j') | no next file with comments »