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

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: rebase to 239274 Created 7 years 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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 'browser/ui/confirm_bubble_model.h', 1080 'browser/ui/confirm_bubble_model.h',
1081 'browser/ui/content_settings/content_setting_bubble_model.cc', 1081 'browser/ui/content_settings/content_setting_bubble_model.cc',
1082 'browser/ui/content_settings/content_setting_bubble_model.h', 1082 'browser/ui/content_settings/content_setting_bubble_model.h',
1083 'browser/ui/content_settings/content_setting_bubble_model_delegate.h', 1083 'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
1084 'browser/ui/content_settings/content_setting_image_model.cc', 1084 'browser/ui/content_settings/content_setting_image_model.cc',
1085 'browser/ui/content_settings/content_setting_image_model.h', 1085 'browser/ui/content_settings/content_setting_image_model.h',
1086 'browser/ui/content_settings/content_setting_media_menu_model.cc', 1086 'browser/ui/content_settings/content_setting_media_menu_model.cc',
1087 'browser/ui/content_settings/content_setting_media_menu_model.h', 1087 'browser/ui/content_settings/content_setting_media_menu_model.h',
1088 'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc', 1088 'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
1089 'browser/ui/content_settings/media_setting_changed_infobar_delegate.h', 1089 'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
1090 'browser/ui/crypto_module_password_dialog.cc', 1090 'browser/ui/crypto_module_delegate_nss.cc',
1091 'browser/ui/crypto_module_delegate_nss.h',
1091 'browser/ui/crypto_module_password_dialog.h', 1092 'browser/ui/crypto_module_password_dialog.h',
1092 'browser/ui/crypto_module_password_dialog_nss.cc', 1093 'browser/ui/crypto_module_password_dialog_nss.cc',
1093 'browser/ui/crypto_module_password_dialog_openssl.cc', 1094 'browser/ui/crypto_module_password_dialog_nss.h',
1094 'browser/ui/extensions/application_launch.cc', 1095 'browser/ui/extensions/application_launch.cc',
1095 'browser/ui/extensions/application_launch.h', 1096 'browser/ui/extensions/application_launch.h',
1096 'browser/ui/extensions/extension_installed_bubble.cc', 1097 'browser/ui/extensions/extension_installed_bubble.cc',
1097 'browser/ui/extensions/extension_installed_bubble.h', 1098 'browser/ui/extensions/extension_installed_bubble.h',
1098 'browser/ui/extensions/extension_install_ui_default.cc', 1099 'browser/ui/extensions/extension_install_ui_default.cc',
1099 'browser/ui/extensions/extension_install_ui_default.h', 1100 'browser/ui/extensions/extension_install_ui_default.h',
1100 'browser/ui/extensions/extension_enable_flow.cc', 1101 'browser/ui/extensions/extension_enable_flow.cc',
1101 'browser/ui/extensions/extension_enable_flow.h', 1102 'browser/ui/extensions/extension_enable_flow.h',
1102 'browser/ui/extensions/extension_enable_flow_delegate.h', 1103 'browser/ui/extensions/extension_enable_flow_delegate.h',
1103 'browser/ui/external_protocol_dialog_delegate.cc', 1104 'browser/ui/external_protocol_dialog_delegate.cc',
(...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after
2941 'link_settings': { 2942 'link_settings': {
2942 'libraries': [ 2943 'libraries': [
2943 '-lXss', 2944 '-lXss',
2944 ], 2945 ],
2945 }, 2946 },
2946 }], 2947 }],
2947 ['use_nss!=1', { 2948 ['use_nss!=1', {
2948 'sources!': [ 2949 'sources!': [
2949 'browser/ui/webui/options/certificate_manager_handler.cc', 2950 'browser/ui/webui/options/certificate_manager_handler.cc',
2950 'browser/ui/webui/options/certificate_manager_handler.h', 2951 'browser/ui/webui/options/certificate_manager_handler.h',
2952 'browser/ui/crypto_module_delegate_nss.cc',
2953 'browser/ui/crypto_module_delegate_nss.h',
2954 'browser/ui/crypto_module_password_dialog_nss.cc',
2955 'browser/ui/crypto_module_password_dialog_nss.h',
2951 ], 2956 ],
2952 }], 2957 }],
2953 ['use_nss==0 and use_openssl==0', { 2958 ['use_nss==0 and use_openssl==0', {
2954 'sources!': [ 2959 'sources!': [
2955 'browser/ui/webui/certificate_viewer_webui.cc', 2960 'browser/ui/webui/certificate_viewer_webui.cc',
2956 'browser/ui/webui/certificate_viewer_webui.h', 2961 'browser/ui/webui/certificate_viewer_webui.h',
2957 'browser/ui/webui/certificate_viewer_ui.cc', 2962 'browser/ui/webui/certificate_viewer_ui.cc',
2958 'browser/ui/webui/certificate_viewer_ui.h', 2963 'browser/ui/webui/certificate_viewer_ui.h',
2959 ], 2964 ],
2960 }], 2965 }],
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
3145 ['exclude', '^browser/ui/webui/suggestions_internals'], 3150 ['exclude', '^browser/ui/webui/suggestions_internals'],
3146 ['exclude', '^browser/ui/webui/sync_file_system_internals'], 3151 ['exclude', '^browser/ui/webui/sync_file_system_internals'],
3147 ['exclude', '^browser/ui/webui/sync_promo'], 3152 ['exclude', '^browser/ui/webui/sync_promo'],
3148 ['exclude', '^browser/ui/webui/uber'], 3153 ['exclude', '^browser/ui/webui/uber'],
3149 ], 3154 ],
3150 }], 3155 }],
3151 ['OS=="mac"', { 3156 ['OS=="mac"', {
3152 'sources!': [ 3157 'sources!': [
3153 'browser/ui/certificate_dialogs.cc', 3158 'browser/ui/certificate_dialogs.cc',
3154 'browser/ui/certificate_dialogs.h', 3159 'browser/ui/certificate_dialogs.h',
3155 'browser/ui/crypto_module_password_dialog.cc',
3156 'browser/ui/crypto_module_password_dialog_nss.cc',
3157 'browser/ui/screen_capture_notification_ui_stub.cc', 3160 'browser/ui/screen_capture_notification_ui_stub.cc',
3158 'browser/ui/tabs/dock_info.cc', 3161 'browser/ui/tabs/dock_info.cc',
3159 'browser/ui/tabs/tab_resources.cc', 3162 'browser/ui/tabs/tab_resources.cc',
3160 'browser/ui/views/extensions/extension_view_views.cc', 3163 'browser/ui/views/extensions/extension_view_views.cc',
3161 'browser/ui/views/extensions/extension_view_views.h', 3164 'browser/ui/views/extensions/extension_view_views.h',
3162 'browser/ui/webui/help/version_updater_basic.cc', 3165 'browser/ui/webui/help/version_updater_basic.cc',
3163 'browser/ui/webui/help/version_updater_basic.h', 3166 'browser/ui/webui/help/version_updater_basic.h',
3164 ], 3167 ],
3165 'dependencies': [ 3168 'dependencies': [
3166 '../ui/ui.gyp:ui_cocoa_third_party_toolkits', 3169 '../ui/ui.gyp:ui_cocoa_third_party_toolkits',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
3222 ], 3225 ],
3223 'sources': [ 3226 'sources': [
3224 'browser/ui/views/network_profile_bubble_view.cc', 3227 'browser/ui/views/network_profile_bubble_view.cc',
3225 'browser/ui/views/network_profile_bubble_view.h', 3228 'browser/ui/views/network_profile_bubble_view.h',
3226 'browser/ui/webui/conflicts_ui.cc', 3229 'browser/ui/webui/conflicts_ui.cc',
3227 'browser/ui/webui/conflicts_ui.h', 3230 'browser/ui/webui/conflicts_ui.h',
3228 ], 3231 ],
3229 'sources!': [ 3232 'sources!': [
3230 'browser/ui/certificate_dialogs.cc', 3233 'browser/ui/certificate_dialogs.cc',
3231 'browser/ui/certificate_dialogs.h', 3234 'browser/ui/certificate_dialogs.h',
3232 'browser/ui/crypto_module_password_dialog.cc',
3233 'browser/ui/crypto_module_password_dialog_nss.cc',
3234 'browser/ui/screen_capture_notification_ui_stub.cc', 3235 'browser/ui/screen_capture_notification_ui_stub.cc',
3235 'browser/ui/startup/autolaunch_prompt.cc', 3236 'browser/ui/startup/autolaunch_prompt.cc',
3236 'browser/ui/views/frame/taskbar_decorator.cc', 3237 'browser/ui/views/frame/taskbar_decorator.cc',
3237 'browser/ui/views/simple_message_box_views.cc', 3238 'browser/ui/views/simple_message_box_views.cc',
3238 'browser/ui/webui/help/version_updater_basic.cc', 3239 'browser/ui/webui/help/version_updater_basic.cc',
3239 'browser/ui/webui/help/version_updater_basic.h', 3240 'browser/ui/webui/help/version_updater_basic.h',
3240 ], 3241 ],
3241 'conditions': [ 3242 'conditions': [
3242 ['win_use_allocator_shim==1', { 3243 ['win_use_allocator_shim==1', {
3243 'dependencies': [ 3244 'dependencies': [
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
3288 }], 3289 }],
3289 # GTK build only 3290 # GTK build only
3290 ['toolkit_uses_gtk==1', { 3291 ['toolkit_uses_gtk==1', {
3291 'sources/': [ 3292 'sources/': [
3292 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'], 3293 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
3293 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'], 3294 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'],
3294 ], 3295 ],
3295 }], 3296 }],
3296 ], 3297 ],
3297 }], 3298 }],
3298 [ 'use_openssl==1', {
3299 'sources!': [
3300 'browser/ui/crypto_module_password_dialog_nss.cc',
3301 ]}, {
3302 'sources!': [
3303 'browser/ui/crypto_module_password_dialog_openssl.cc',
3304 ]},
3305 ],
3306 # File manager extension replaces the native OS file open/save dialog. 3299 # File manager extension replaces the native OS file open/save dialog.
3307 ['file_manager_extension==1', { 3300 ['file_manager_extension==1', {
3308 'sources/': [ 3301 'sources/': [
3309 ['include', '^browser/ui/views/select_file_dialog_extension.cc'], 3302 ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
3310 ['include', '^browser/ui/views/select_file_dialog_extension.h'], 3303 ['include', '^browser/ui/views/select_file_dialog_extension.h'],
3311 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'], 3304 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'],
3312 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'], 3305 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'],
3313 ]}, { 3306 ]}, {
3314 'sources/': [ 3307 'sources/': [
3315 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'], 3308 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
3361 'browser/ui/webui/local_discovery/local_discovery_ui.cc', 3354 'browser/ui/webui/local_discovery/local_discovery_ui.cc',
3362 'browser/ui/webui/local_discovery/local_discovery_ui.h', 3355 'browser/ui/webui/local_discovery/local_discovery_ui.h',
3363 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', 3356 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
3364 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 3357 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
3365 ], 3358 ],
3366 }], 3359 }],
3367 ], 3360 ],
3368 }, 3361 },
3369 ], 3362 ],
3370 } 3363 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698