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

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: review changes 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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 'browser/ui/confirm_bubble_model.h', 1067 'browser/ui/confirm_bubble_model.h',
1068 'browser/ui/content_settings/content_setting_bubble_model.cc', 1068 'browser/ui/content_settings/content_setting_bubble_model.cc',
1069 'browser/ui/content_settings/content_setting_bubble_model.h', 1069 'browser/ui/content_settings/content_setting_bubble_model.h',
1070 'browser/ui/content_settings/content_setting_bubble_model_delegate.h', 1070 'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
1071 'browser/ui/content_settings/content_setting_image_model.cc', 1071 'browser/ui/content_settings/content_setting_image_model.cc',
1072 'browser/ui/content_settings/content_setting_image_model.h', 1072 'browser/ui/content_settings/content_setting_image_model.h',
1073 'browser/ui/content_settings/content_setting_media_menu_model.cc', 1073 'browser/ui/content_settings/content_setting_media_menu_model.cc',
1074 'browser/ui/content_settings/content_setting_media_menu_model.h', 1074 'browser/ui/content_settings/content_setting_media_menu_model.h',
1075 'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc', 1075 'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
1076 'browser/ui/content_settings/media_setting_changed_infobar_delegate.h', 1076 'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
1077 'browser/ui/crypto_module_password_dialog.cc', 1077 'browser/ui/crypto_module_delegate_nss.cc',
1078 'browser/ui/crypto_module_delegate_nss.h',
1078 'browser/ui/crypto_module_password_dialog.h', 1079 'browser/ui/crypto_module_password_dialog.h',
1079 'browser/ui/crypto_module_password_dialog_nss.cc', 1080 'browser/ui/crypto_module_password_dialog_nss.cc',
1080 'browser/ui/crypto_module_password_dialog_openssl.cc', 1081 'browser/ui/crypto_module_password_dialog_nss.h',
1081 'browser/ui/extensions/application_launch.cc', 1082 'browser/ui/extensions/application_launch.cc',
1082 'browser/ui/extensions/application_launch.h', 1083 'browser/ui/extensions/application_launch.h',
1083 'browser/ui/extensions/extension_installed_bubble.cc', 1084 'browser/ui/extensions/extension_installed_bubble.cc',
1084 'browser/ui/extensions/extension_installed_bubble.h', 1085 'browser/ui/extensions/extension_installed_bubble.h',
1085 'browser/ui/extensions/extension_install_ui_default.cc', 1086 'browser/ui/extensions/extension_install_ui_default.cc',
1086 'browser/ui/extensions/extension_install_ui_default.h', 1087 'browser/ui/extensions/extension_install_ui_default.h',
1087 'browser/ui/extensions/extension_enable_flow.cc', 1088 'browser/ui/extensions/extension_enable_flow.cc',
1088 'browser/ui/extensions/extension_enable_flow.h', 1089 'browser/ui/extensions/extension_enable_flow.h',
1089 'browser/ui/extensions/extension_enable_flow_delegate.h', 1090 'browser/ui/extensions/extension_enable_flow_delegate.h',
1090 'browser/ui/external_protocol_dialog_delegate.cc', 1091 'browser/ui/external_protocol_dialog_delegate.cc',
(...skipping 1835 matching lines...) Expand 10 before | Expand all | Expand 10 after
2926 'link_settings': { 2927 'link_settings': {
2927 'libraries': [ 2928 'libraries': [
2928 '-lXss', 2929 '-lXss',
2929 ], 2930 ],
2930 }, 2931 },
2931 }], 2932 }],
2932 ['use_nss!=1', { 2933 ['use_nss!=1', {
2933 'sources!': [ 2934 'sources!': [
2934 'browser/ui/webui/options/certificate_manager_handler.cc', 2935 'browser/ui/webui/options/certificate_manager_handler.cc',
2935 'browser/ui/webui/options/certificate_manager_handler.h', 2936 'browser/ui/webui/options/certificate_manager_handler.h',
2937 'browser/ui/crypto_module_delegate_nss.cc',
2938 'browser/ui/crypto_module_delegate_nss.h',
2939 'browser/ui/crypto_module_password_dialog_nss.cc',
2940 'browser/ui/crypto_module_password_dialog_nss.h',
2936 ], 2941 ],
2937 }], 2942 }],
2938 ['use_nss==0 and use_openssl==0', { 2943 ['use_nss==0 and use_openssl==0', {
2939 'sources!': [ 2944 'sources!': [
2940 'browser/ui/webui/certificate_viewer_webui.cc', 2945 'browser/ui/webui/certificate_viewer_webui.cc',
2941 'browser/ui/webui/certificate_viewer_webui.h', 2946 'browser/ui/webui/certificate_viewer_webui.h',
2942 'browser/ui/webui/certificate_viewer_ui.cc', 2947 'browser/ui/webui/certificate_viewer_ui.cc',
2943 'browser/ui/webui/certificate_viewer_ui.h', 2948 'browser/ui/webui/certificate_viewer_ui.h',
2944 ], 2949 ],
2945 }], 2950 }],
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
3128 ['exclude', '^browser/ui/webui/suggestions_internals'], 3133 ['exclude', '^browser/ui/webui/suggestions_internals'],
3129 ['exclude', '^browser/ui/webui/sync_file_system_internals'], 3134 ['exclude', '^browser/ui/webui/sync_file_system_internals'],
3130 ['exclude', '^browser/ui/webui/sync_promo'], 3135 ['exclude', '^browser/ui/webui/sync_promo'],
3131 ['exclude', '^browser/ui/webui/uber'], 3136 ['exclude', '^browser/ui/webui/uber'],
3132 ], 3137 ],
3133 }], 3138 }],
3134 ['OS=="mac"', { 3139 ['OS=="mac"', {
3135 'sources!': [ 3140 'sources!': [
3136 'browser/ui/certificate_dialogs.cc', 3141 'browser/ui/certificate_dialogs.cc',
3137 'browser/ui/certificate_dialogs.h', 3142 'browser/ui/certificate_dialogs.h',
3138 'browser/ui/crypto_module_password_dialog.cc',
3139 'browser/ui/crypto_module_password_dialog_nss.cc',
3140 'browser/ui/screen_capture_notification_ui_stub.cc', 3143 'browser/ui/screen_capture_notification_ui_stub.cc',
3141 'browser/ui/tabs/dock_info.cc', 3144 'browser/ui/tabs/dock_info.cc',
3142 'browser/ui/tabs/tab_resources.cc', 3145 'browser/ui/tabs/tab_resources.cc',
3143 'browser/ui/views/extensions/extension_view_views.cc', 3146 'browser/ui/views/extensions/extension_view_views.cc',
3144 'browser/ui/views/extensions/extension_view_views.h', 3147 'browser/ui/views/extensions/extension_view_views.h',
3145 'browser/ui/webui/help/version_updater_basic.cc', 3148 'browser/ui/webui/help/version_updater_basic.cc',
3146 'browser/ui/webui/help/version_updater_basic.h', 3149 'browser/ui/webui/help/version_updater_basic.h',
3147 ], 3150 ],
3148 'dependencies': [ 3151 'dependencies': [
3149 '../ui/ui.gyp:ui_cocoa_third_party_toolkits', 3152 '../ui/ui.gyp:ui_cocoa_third_party_toolkits',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
3203 ], 3206 ],
3204 'sources': [ 3207 'sources': [
3205 'browser/ui/views/network_profile_bubble_view.cc', 3208 'browser/ui/views/network_profile_bubble_view.cc',
3206 'browser/ui/views/network_profile_bubble_view.h', 3209 'browser/ui/views/network_profile_bubble_view.h',
3207 'browser/ui/webui/conflicts_ui.cc', 3210 'browser/ui/webui/conflicts_ui.cc',
3208 'browser/ui/webui/conflicts_ui.h', 3211 'browser/ui/webui/conflicts_ui.h',
3209 ], 3212 ],
3210 'sources!': [ 3213 'sources!': [
3211 'browser/ui/certificate_dialogs.cc', 3214 'browser/ui/certificate_dialogs.cc',
3212 'browser/ui/certificate_dialogs.h', 3215 'browser/ui/certificate_dialogs.h',
3213 'browser/ui/crypto_module_password_dialog.cc',
3214 'browser/ui/crypto_module_password_dialog_nss.cc',
3215 'browser/ui/screen_capture_notification_ui_stub.cc', 3216 'browser/ui/screen_capture_notification_ui_stub.cc',
3216 'browser/ui/startup/autolaunch_prompt.cc', 3217 'browser/ui/startup/autolaunch_prompt.cc',
3217 'browser/ui/views/frame/taskbar_decorator.cc', 3218 'browser/ui/views/frame/taskbar_decorator.cc',
3218 'browser/ui/views/simple_message_box_views.cc', 3219 'browser/ui/views/simple_message_box_views.cc',
3219 'browser/ui/webui/help/version_updater_basic.cc', 3220 'browser/ui/webui/help/version_updater_basic.cc',
3220 'browser/ui/webui/help/version_updater_basic.h', 3221 'browser/ui/webui/help/version_updater_basic.h',
3221 ], 3222 ],
3222 'conditions': [ 3223 'conditions': [
3223 ['win_use_allocator_shim==1', { 3224 ['win_use_allocator_shim==1', {
3224 'dependencies': [ 3225 'dependencies': [
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
3269 }], 3270 }],
3270 # GTK build only 3271 # GTK build only
3271 ['toolkit_uses_gtk==1', { 3272 ['toolkit_uses_gtk==1', {
3272 'sources/': [ 3273 'sources/': [
3273 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'], 3274 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
3274 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'], 3275 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'],
3275 ], 3276 ],
3276 }], 3277 }],
3277 ], 3278 ],
3278 }], 3279 }],
3279 [ 'use_openssl==1', {
3280 'sources!': [
3281 'browser/ui/crypto_module_password_dialog_nss.cc',
3282 ]}, {
3283 'sources!': [
3284 'browser/ui/crypto_module_password_dialog_openssl.cc',
3285 ]},
3286 ],
3287 # File manager extension replaces the native OS file open/save dialog. 3280 # File manager extension replaces the native OS file open/save dialog.
3288 ['file_manager_extension==1', { 3281 ['file_manager_extension==1', {
3289 'sources/': [ 3282 'sources/': [
3290 ['include', '^browser/ui/views/select_file_dialog_extension.cc'], 3283 ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
3291 ['include', '^browser/ui/views/select_file_dialog_extension.h'], 3284 ['include', '^browser/ui/views/select_file_dialog_extension.h'],
3292 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'], 3285 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'],
3293 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'], 3286 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'],
3294 ]}, { 3287 ]}, {
3295 'sources/': [ 3288 'sources/': [
3296 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'], 3289 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
3342 'browser/ui/webui/local_discovery/local_discovery_ui.cc', 3335 'browser/ui/webui/local_discovery/local_discovery_ui.cc',
3343 'browser/ui/webui/local_discovery/local_discovery_ui.h', 3336 'browser/ui/webui/local_discovery/local_discovery_ui.h',
3344 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', 3337 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
3345 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 3338 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
3346 ], 3339 ],
3347 }], 3340 }],
3348 ], 3341 ],
3349 }, 3342 },
3350 ], 3343 ],
3351 } 3344 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698