chrome/chrome_browser.gypi - Issue 419013003: Replace c/b/nss_context by a KeyedService.

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

Unified Diff: chrome/chrome_browser.gypi

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase, format. Created 6 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/crypto_module_delegate_nss.cc ('K') | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | components/cert_database/chromeos/cert_database_service_io_part_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 058cb5e8d60ee8425211f6fb94521c01f0dcf6a8..aa7c306443d9a280fd04a9a51bb649a0f5eef4a5 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1741,10 +1741,10 @@

'chrome_browser_nss_sources': [

'browser/certificate_manager_model.cc',

'browser/certificate_manager_model.h',

- 'browser/net/nss_context.cc',

- 'browser/net/nss_context.h',

- 'browser/net/nss_context_chromeos.cc',

- 'browser/net/nss_context_linux.cc',

+ 'browser/net/cert_database_service_factory.cc',

+ 'browser/net/cert_database_service_factory_chromeos.cc',

+ 'browser/net/cert_database_service_factory_linux.cc',

+ 'browser/net/cert_database_service_factory.h',

'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',

'third_party/mozilla_security_manager/nsNSSCertHelper.h',

'third_party/mozilla_security_manager/nsNSSCertificate.cpp',

@@ -3201,13 +3201,16 @@

}],

['use_nss==1', {

'sources': [ '<@(chrome_browser_nss_sources)' ],

- 'conditions': [

- ['chromeos==1', {

- 'sources!': [ 'browser/net/nss_context_linux.cc' ],

- }, { # chromeos==0

- 'sources!': [ 'browser/net/nss_context_chromeos.cc' ],

- }],

+ 'dependencies': [

+ '../components/components.gyp:cert_database',

+ 'conditions': [

+ ['desktop_linux==0', {

+ 'sources!': [

+ 'browser/net/cert_database_service_factory_linux.cc'

+ ],

+ }],

+ ],

}],

['notifications==1', {

'sources': [ '<@(chrome_browser_notifications_sources)' ],