chrome/chrome_browser_ui.gypi - Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile.

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_ui.gypi

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync to r235279 Created 7 years, 1 month 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/options/certificate_manager_handler.cc ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | crypto/nss_crypto_module_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser_ui.gypi

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

index 311282e18dc2b215837dbb8b2361c31e2a2c8bc3..125b107aebcc03025fc4e34ed9eb87be39fd00e3 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -1059,10 +1059,11 @@

'browser/ui/content_settings/content_setting_media_menu_model.h',

'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',

'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',

- 'browser/ui/crypto_module_password_dialog.cc',

+ 'browser/ui/crypto_module_delegate_nss.cc',

+ 'browser/ui/crypto_module_delegate_nss.h',

'browser/ui/crypto_module_password_dialog.h',

'browser/ui/crypto_module_password_dialog_nss.cc',

- 'browser/ui/crypto_module_password_dialog_openssl.cc',

+ 'browser/ui/crypto_module_password_dialog_nss.h',

'browser/ui/extensions/application_launch.cc',

'browser/ui/extensions/application_launch.h',

'browser/ui/extensions/extension_installed_bubble.cc',

@@ -2904,6 +2905,10 @@

'sources!': [

'browser/ui/webui/options/certificate_manager_handler.cc',

'browser/ui/webui/options/certificate_manager_handler.h',

+ 'browser/ui/crypto_module_delegate_nss.cc',

+ 'browser/ui/crypto_module_delegate_nss.h',

+ 'browser/ui/crypto_module_password_dialog_nss.cc',

+ 'browser/ui/crypto_module_password_dialog_nss.h',

}],

['use_nss==0 and use_openssl==0', {

@@ -3106,8 +3111,6 @@

'sources!': [

'browser/ui/certificate_dialogs.cc',

'browser/ui/certificate_dialogs.h',

- 'browser/ui/crypto_module_password_dialog.cc',

- 'browser/ui/crypto_module_password_dialog_nss.cc',

'browser/ui/screen_capture_notification_ui_stub.cc',

'browser/ui/tabs/dock_info.cc',

'browser/ui/tabs/tab_resources.cc',

@@ -3181,8 +3184,6 @@

'sources!': [

'browser/ui/certificate_dialogs.cc',

'browser/ui/certificate_dialogs.h',

- 'browser/ui/crypto_module_password_dialog.cc',

- 'browser/ui/crypto_module_password_dialog_nss.cc',

'browser/ui/screen_capture_notification_ui_stub.cc',

'browser/ui/startup/autolaunch_prompt.cc',

'browser/ui/views/frame/taskbar_decorator.cc',

@@ -3247,14 +3248,6 @@

}],

- [ 'use_openssl==1', {

- 'sources!': [

- 'browser/ui/crypto_module_password_dialog_nss.cc',

- ]}, {

- 'sources!': [

- 'browser/ui/crypto_module_password_dialog_openssl.cc',

- ]},

- ],

# File manager extension replaces the native OS file open/save dialog.

['file_manager_extension==1', {

'sources/': [