chrome/chrome_browser.gypi - Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome.

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 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanups, add test for chrome keygen class Created 7 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

« chrome/browser/chrome_content_browser_client.h ('K') | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/chrome_tests.gypi » ('j') | content/browser/renderer_host/render_message_filter.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 3e6994087ec4a11a03d3639aefe22a144ca24e29..485a3ea199b81817bb01c5283cb5e630a4e344a3 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1185,6 +1185,9 @@

'browser/net/http_pipelining_compatibility_client.h',

'browser/net/http_server_properties_manager.cc',

'browser/net/http_server_properties_manager.h',

+ 'browser/net/keygen_handler.h',

+ 'browser/net/keygen_handler_generic.cc',

+ 'browser/net/keygen_handler_nss.cc',

'browser/net/load_time_stats.cc',

'browser/net/load_time_stats.h',

'browser/net/net_error_tab_helper.cc',

@@ -1197,6 +1200,8 @@

'browser/net/network_stats.h',

'browser/net/network_time_tracker.cc',

'browser/net/network_time_tracker.h',

+ 'browser/net/nss_slot_factory.cc',

+ 'browser/net/nss_slot_factory.h',

'browser/net/preconnect.cc',

'browser/net/preconnect.h',

'browser/net/predictor.cc',

@@ -2948,10 +2953,16 @@

'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',

'third_party/mozilla_security_manager/nsUsageArrayHelper.h',

+ 'sources!': [

+ 'browser/net/keygen_handler_generic.cc',

+ ],

}, { # use_nss==0

'sources!': [

'browser/certificate_manager_model.cc',

'browser/certificate_manager_model.h',

+ 'browser/net/keygen_handler_nss.cc',

+ 'browser/net/nss_slot_factory.cc',

+ 'browser/net/nss_slot_factory.h',

}],

['toolkit_uses_gtk == 1', {