Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser_ui', 8 'target_name': 'browser_ui',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 'browser/ui/confirm_bubble_model.h', 1052 'browser/ui/confirm_bubble_model.h',
1053 'browser/ui/content_settings/content_setting_bubble_model.cc', 1053 'browser/ui/content_settings/content_setting_bubble_model.cc',
1054 'browser/ui/content_settings/content_setting_bubble_model.h', 1054 'browser/ui/content_settings/content_setting_bubble_model.h',
1055 'browser/ui/content_settings/content_setting_bubble_model_delegate.h', 1055 'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
1056 'browser/ui/content_settings/content_setting_image_model.cc', 1056 'browser/ui/content_settings/content_setting_image_model.cc',
1057 'browser/ui/content_settings/content_setting_image_model.h', 1057 'browser/ui/content_settings/content_setting_image_model.h',
1058 'browser/ui/content_settings/content_setting_media_menu_model.cc', 1058 'browser/ui/content_settings/content_setting_media_menu_model.cc',
1059 'browser/ui/content_settings/content_setting_media_menu_model.h', 1059 'browser/ui/content_settings/content_setting_media_menu_model.h',
1060 'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc', 1060 'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
1061 'browser/ui/content_settings/media_setting_changed_infobar_delegate.h', 1061 'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
1062 'browser/ui/crypto_module_password_dialog.cc', 1062 'browser/ui/crypto_module_delegate_nss.cc',
1063 'browser/ui/crypto_module_delegate_nss.h',
1063 'browser/ui/crypto_module_password_dialog.h', 1064 'browser/ui/crypto_module_password_dialog.h',
1064 'browser/ui/crypto_module_password_dialog_nss.cc', 1065 'browser/ui/crypto_module_password_dialog_nss.cc',
1065 'browser/ui/crypto_module_password_dialog_openssl.cc', 1066 'browser/ui/crypto_module_password_dialog_nss.h',
1066 'browser/ui/extensions/application_launch.cc', 1067 'browser/ui/extensions/application_launch.cc',
1067 'browser/ui/extensions/application_launch.h', 1068 'browser/ui/extensions/application_launch.h',
1068 'browser/ui/extensions/extension_installed_bubble.cc', 1069 'browser/ui/extensions/extension_installed_bubble.cc',
1069 'browser/ui/extensions/extension_installed_bubble.h', 1070 'browser/ui/extensions/extension_installed_bubble.h',
1070 'browser/ui/extensions/extension_install_ui_default.cc', 1071 'browser/ui/extensions/extension_install_ui_default.cc',
1071 'browser/ui/extensions/extension_install_ui_default.h', 1072 'browser/ui/extensions/extension_install_ui_default.h',
1072 'browser/ui/extensions/extension_enable_flow.cc', 1073 'browser/ui/extensions/extension_enable_flow.cc',
1073 'browser/ui/extensions/extension_enable_flow.h', 1074 'browser/ui/extensions/extension_enable_flow.h',
1074 'browser/ui/extensions/extension_enable_flow_delegate.h', 1075 'browser/ui/extensions/extension_enable_flow_delegate.h',
1075 'browser/ui/external_protocol_dialog_delegate.cc', 1076 'browser/ui/external_protocol_dialog_delegate.cc',
(...skipping 1821 matching lines...) Expand 10 before | Expand all | Expand 10 after
2897 'link_settings': { 2898 'link_settings': {
2898 'libraries': [ 2899 'libraries': [
2899 '-lXss', 2900 '-lXss',
2900 ], 2901 ],
2901 }, 2902 },
2902 }], 2903 }],
2903 ['use_nss!=1', { 2904 ['use_nss!=1', {
2904 'sources!': [ 2905 'sources!': [
2905 'browser/ui/webui/options/certificate_manager_handler.cc', 2906 'browser/ui/webui/options/certificate_manager_handler.cc',
2906 'browser/ui/webui/options/certificate_manager_handler.h', 2907 'browser/ui/webui/options/certificate_manager_handler.h',
2908 'browser/ui/crypto_module_delegate_nss.cc',
2909 'browser/ui/crypto_module_delegate_nss.h',
2910 'browser/ui/crypto_module_password_dialog_nss.cc',
2911 'browser/ui/crypto_module_password_dialog_nss.h',
2907 ], 2912 ],
2908 }], 2913 }],
2909 ['use_nss==0 and use_openssl==0', { 2914 ['use_nss==0 and use_openssl==0', {
2910 'sources!': [ 2915 'sources!': [
2911 'browser/ui/webui/certificate_viewer_webui.cc', 2916 'browser/ui/webui/certificate_viewer_webui.cc',
2912 'browser/ui/webui/certificate_viewer_webui.h', 2917 'browser/ui/webui/certificate_viewer_webui.h',
2913 'browser/ui/webui/certificate_viewer_ui.cc', 2918 'browser/ui/webui/certificate_viewer_ui.cc',
2914 'browser/ui/webui/certificate_viewer_ui.h', 2919 'browser/ui/webui/certificate_viewer_ui.h',
2915 ], 2920 ],
2916 }], 2921 }],
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
3099 ['exclude', '^browser/ui/webui/suggestions_internals'], 3104 ['exclude', '^browser/ui/webui/suggestions_internals'],
3100 ['exclude', '^browser/ui/webui/sync_file_system_internals'], 3105 ['exclude', '^browser/ui/webui/sync_file_system_internals'],
3101 ['exclude', '^browser/ui/webui/sync_promo'], 3106 ['exclude', '^browser/ui/webui/sync_promo'],
3102 ['exclude', '^browser/ui/webui/uber'], 3107 ['exclude', '^browser/ui/webui/uber'],
3103 ], 3108 ],
3104 }], 3109 }],
3105 ['OS=="mac"', { 3110 ['OS=="mac"', {
3106 'sources!': [ 3111 'sources!': [
3107 'browser/ui/certificate_dialogs.cc', 3112 'browser/ui/certificate_dialogs.cc',
3108 'browser/ui/certificate_dialogs.h', 3113 'browser/ui/certificate_dialogs.h',
3109 'browser/ui/crypto_module_password_dialog.cc',
3110 'browser/ui/crypto_module_password_dialog_nss.cc',
3111 'browser/ui/screen_capture_notification_ui_stub.cc', 3114 'browser/ui/screen_capture_notification_ui_stub.cc',
3112 'browser/ui/tabs/dock_info.cc', 3115 'browser/ui/tabs/dock_info.cc',
3113 'browser/ui/tabs/tab_resources.cc', 3116 'browser/ui/tabs/tab_resources.cc',
3114 'browser/ui/views/extensions/extension_view_views.cc', 3117 'browser/ui/views/extensions/extension_view_views.cc',
3115 'browser/ui/views/extensions/extension_view_views.h', 3118 'browser/ui/views/extensions/extension_view_views.h',
3116 'browser/ui/webui/help/version_updater_basic.cc', 3119 'browser/ui/webui/help/version_updater_basic.cc',
3117 'browser/ui/webui/help/version_updater_basic.h', 3120 'browser/ui/webui/help/version_updater_basic.h',
3118 ], 3121 ],
3119 'dependencies': [ 3122 'dependencies': [
3120 '../ui/ui.gyp:ui_cocoa_third_party_toolkits', 3123 '../ui/ui.gyp:ui_cocoa_third_party_toolkits',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
3174 ], 3177 ],
3175 'sources': [ 3178 'sources': [
3176 'browser/ui/views/network_profile_bubble_view.cc', 3179 'browser/ui/views/network_profile_bubble_view.cc',
3177 'browser/ui/views/network_profile_bubble_view.h', 3180 'browser/ui/views/network_profile_bubble_view.h',
3178 'browser/ui/webui/conflicts_ui.cc', 3181 'browser/ui/webui/conflicts_ui.cc',
3179 'browser/ui/webui/conflicts_ui.h', 3182 'browser/ui/webui/conflicts_ui.h',
3180 ], 3183 ],
3181 'sources!': [ 3184 'sources!': [
3182 'browser/ui/certificate_dialogs.cc', 3185 'browser/ui/certificate_dialogs.cc',
3183 'browser/ui/certificate_dialogs.h', 3186 'browser/ui/certificate_dialogs.h',
3184 'browser/ui/crypto_module_password_dialog.cc',
3185 'browser/ui/crypto_module_password_dialog_nss.cc',
3186 'browser/ui/screen_capture_notification_ui_stub.cc', 3187 'browser/ui/screen_capture_notification_ui_stub.cc',
3187 'browser/ui/startup/autolaunch_prompt.cc', 3188 'browser/ui/startup/autolaunch_prompt.cc',
3188 'browser/ui/views/frame/taskbar_decorator.cc', 3189 'browser/ui/views/frame/taskbar_decorator.cc',
3189 'browser/ui/views/simple_message_box_views.cc', 3190 'browser/ui/views/simple_message_box_views.cc',
3190 'browser/ui/webui/help/version_updater_basic.cc', 3191 'browser/ui/webui/help/version_updater_basic.cc',
3191 'browser/ui/webui/help/version_updater_basic.h', 3192 'browser/ui/webui/help/version_updater_basic.h',
3192 ], 3193 ],
3193 'conditions': [ 3194 'conditions': [
3194 ['win_use_allocator_shim==1', { 3195 ['win_use_allocator_shim==1', {
3195 'dependencies': [ 3196 'dependencies': [
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
3240 }], 3241 }],
3241 # GTK build only 3242 # GTK build only
3242 ['toolkit_uses_gtk==1', { 3243 ['toolkit_uses_gtk==1', {
3243 'sources/': [ 3244 'sources/': [
3244 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'], 3245 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
3245 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'], 3246 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'],
3246 ], 3247 ],
3247 }], 3248 }],
3248 ], 3249 ],
3249 }], 3250 }],
3250 [ 'use_openssl==1', {
3251 'sources!': [
3252 'browser/ui/crypto_module_password_dialog_nss.cc',
3253 ]}, {
3254 'sources!': [
3255 'browser/ui/crypto_module_password_dialog_openssl.cc',
3256 ]},
3257 ],
3258 # File manager extension replaces the native OS file open/save dialog. 3251 # File manager extension replaces the native OS file open/save dialog.
3259 ['file_manager_extension==1', { 3252 ['file_manager_extension==1', {
3260 'sources/': [ 3253 'sources/': [
3261 ['include', '^browser/ui/views/select_file_dialog_extension.cc'], 3254 ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
3262 ['include', '^browser/ui/views/select_file_dialog_extension.h'], 3255 ['include', '^browser/ui/views/select_file_dialog_extension.h'],
3263 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'], 3256 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'],
3264 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'], 3257 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'],
3265 ]}, { 3258 ]}, {
3266 'sources/': [ 3259 'sources/': [
3267 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'], 3260 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
3313 'browser/ui/webui/local_discovery/local_discovery_ui.cc', 3306 'browser/ui/webui/local_discovery/local_discovery_ui.cc',
3314 'browser/ui/webui/local_discovery/local_discovery_ui.h', 3307 'browser/ui/webui/local_discovery/local_discovery_ui.h',
3315 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', 3308 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
3316 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 3309 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
3317 ], 3310 ],
3318 }], 3311 }],
3319 ], 3312 ],
3320 }, 3313 },
3321 ], 3314 ],
3322 } 3315 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698