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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 6303004: Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indentation, compile fix Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1519 'browser/gtk/options/passwords_page_gtk.h', 1519 'browser/gtk/options/passwords_page_gtk.h',
1520 'browser/gtk/options/simple_content_exceptions_window.cc', 1520 'browser/gtk/options/simple_content_exceptions_window.cc',
1521 'browser/gtk/options/simple_content_exceptions_window.h', 1521 'browser/gtk/options/simple_content_exceptions_window.h',
1522 'browser/gtk/options/url_picker_dialog_gtk.cc', 1522 'browser/gtk/options/url_picker_dialog_gtk.cc',
1523 'browser/gtk/options/url_picker_dialog_gtk.h', 1523 'browser/gtk/options/url_picker_dialog_gtk.h',
1524 'browser/gtk/overflow_button.cc', 1524 'browser/gtk/overflow_button.cc',
1525 'browser/gtk/overflow_button.h', 1525 'browser/gtk/overflow_button.h',
1526 'browser/gtk/owned_widget_gtk.cc', 1526 'browser/gtk/owned_widget_gtk.cc',
1527 'browser/gtk/owned_widget_gtk.h', 1527 'browser/gtk/owned_widget_gtk.h',
1528 'browser/gtk/page_info_bubble_gtk.cc', 1528 'browser/gtk/page_info_bubble_gtk.cc',
1529 'browser/gtk/pk11_password_dialog.cc', 1529 'browser/gtk/crypto_module_password_dialog.cc',
wtc 2011/01/15 17:40:40 Nit: list this file in alphabetical order now that
mattm 2011/01/19 00:59:34 Done.
1530 'browser/gtk/process_singleton_dialog.cc', 1530 'browser/gtk/process_singleton_dialog.cc',
1531 'browser/gtk/process_singleton_dialog.h', 1531 'browser/gtk/process_singleton_dialog.h',
1532 'browser/gtk/reload_button_gtk.cc', 1532 'browser/gtk/reload_button_gtk.cc',
1533 'browser/gtk/reload_button_gtk.h', 1533 'browser/gtk/reload_button_gtk.h',
1534 'browser/gtk/repost_form_warning_gtk.cc', 1534 'browser/gtk/repost_form_warning_gtk.cc',
1535 'browser/gtk/repost_form_warning_gtk.h', 1535 'browser/gtk/repost_form_warning_gtk.h',
1536 'browser/gtk/rounded_window.cc', 1536 'browser/gtk/rounded_window.cc',
1537 'browser/gtk/rounded_window.h', 1537 'browser/gtk/rounded_window.h',
1538 'browser/gtk/sad_tab_gtk.cc', 1538 'browser/gtk/sad_tab_gtk.cc',
1539 'browser/gtk/sad_tab_gtk.h', 1539 'browser/gtk/sad_tab_gtk.h',
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after
3087 'browser/ui/omnibox/location_bar.h', 3087 'browser/ui/omnibox/location_bar.h',
3088 'browser/ui/omnibox/location_bar_util.cc', 3088 'browser/ui/omnibox/location_bar_util.cc',
3089 'browser/ui/omnibox/location_bar_util.h', 3089 'browser/ui/omnibox/location_bar_util.h',
3090 'browser/ui/options/options_page_base.cc', 3090 'browser/ui/options/options_page_base.cc',
3091 'browser/ui/options/options_page_base.h', 3091 'browser/ui/options/options_page_base.h',
3092 'browser/ui/options/options_util.cc', 3092 'browser/ui/options/options_util.cc',
3093 'browser/ui/options/options_util.h', 3093 'browser/ui/options/options_util.h',
3094 'browser/ui/options/options_window.h', 3094 'browser/ui/options/options_window.h',
3095 'browser/ui/options/show_options_url.cc', 3095 'browser/ui/options/show_options_url.cc',
3096 'browser/ui/options/show_options_url.h', 3096 'browser/ui/options/show_options_url.h',
3097 'browser/ui/pk11_password_dialog.h', 3097 'browser/ui/crypto_module_password_dialog.h',
3098 'browser/ui/pk11_password_dialog_nss.cc', 3098 'browser/ui/crypto_module_password_dialog_nss.cc',
3099 'browser/ui/status_bubble.h', 3099 'browser/ui/status_bubble.h',
3100 'browser/ui/tab_contents/tab_contents_wrapper.cc', 3100 'browser/ui/tab_contents/tab_contents_wrapper.cc',
3101 'browser/ui/tab_contents/tab_contents_wrapper.h', 3101 'browser/ui/tab_contents/tab_contents_wrapper.h',
3102 'browser/ui/tabs/dock_info_gtk.cc', 3102 'browser/ui/tabs/dock_info_gtk.cc',
3103 'browser/ui/tabs/dock_info_mac.cc', 3103 'browser/ui/tabs/dock_info_mac.cc',
3104 'browser/ui/tabs/dock_info_win.cc', 3104 'browser/ui/tabs/dock_info_win.cc',
3105 'browser/ui/tabs/dock_info.cc', 3105 'browser/ui/tabs/dock_info.cc',
3106 'browser/ui/tabs/dock_info.h', 3106 'browser/ui/tabs/dock_info.h',
3107 'browser/ui/tabs/tab_menu_model.cc', 3107 'browser/ui/tabs/tab_menu_model.cc',
3108 'browser/ui/tabs/tab_menu_model.h', 3108 'browser/ui/tabs/tab_menu_model.h',
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
3713 'browser/importer/nss_decryptor_system_nss.h', 3713 'browser/importer/nss_decryptor_system_nss.h',
3714 'browser/jankometer.cc', 3714 'browser/jankometer.cc',
3715 'browser/password_manager/login_database_posix.cc', 3715 'browser/password_manager/login_database_posix.cc',
3716 'browser/power_save_blocker_stub.cc', 3716 'browser/power_save_blocker_stub.cc',
3717 'browser/renderer_host/backing_store_proxy.cc', 3717 'browser/renderer_host/backing_store_proxy.cc',
3718 'browser/renderer_host/backing_store_proxy.h', 3718 'browser/renderer_host/backing_store_proxy.h',
3719 'browser/renderer_host/gpu_view_host.cc', 3719 'browser/renderer_host/gpu_view_host.cc',
3720 'browser/renderer_host/gpu_view_host.h', 3720 'browser/renderer_host/gpu_view_host.h',
3721 'browser/renderer_host/video_layer_proxy.cc', 3721 'browser/renderer_host/video_layer_proxy.cc',
3722 'browser/renderer_host/video_layer_proxy.h', 3722 'browser/renderer_host/video_layer_proxy.h',
3723 'browser/ui/pk11_password_dialog_nss.cc', 3723 'browser/ui/crypto_module_password_dialog_nss.cc',
3724 'browser/ui/views/extensions/extension_view.cc', 3724 'browser/ui/views/extensions/extension_view.cc',
3725 'browser/ui/views/extensions/extension_view.h', 3725 'browser/ui/views/extensions/extension_view.h',
3726 ], 3726 ],
3727 'sources': [ 3727 'sources': [
3728 # Build Apple sample code 3728 # Build Apple sample code
3729 '../third_party/apple/ImageAndTextCell.h', 3729 '../third_party/apple/ImageAndTextCell.h',
3730 '../third_party/apple/ImageAndTextCell.m', 3730 '../third_party/apple/ImageAndTextCell.m',
3731 # Build the necessary GTM sources 3731 # Build the necessary GTM sources
3732 '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h', 3732 '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h',
3733 '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.m', 3733 '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.m',
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
3891 'browser/dom_ui/conflicts_ui.cc', 3891 'browser/dom_ui/conflicts_ui.cc',
3892 'browser/dom_ui/conflicts_ui.h', 3892 'browser/dom_ui/conflicts_ui.h',
3893 'browser/history/history_indexer.idl', 3893 'browser/history/history_indexer.idl',
3894 ], 3894 ],
3895 'sources!': [ 3895 'sources!': [
3896 'browser/ui/browser_list_stub.cc', 3896 'browser/ui/browser_list_stub.cc',
3897 'browser/history/history_publisher_none.cc', 3897 'browser/history/history_publisher_none.cc',
3898 'browser/importer/nss_decryptor_system_nss.cc', 3898 'browser/importer/nss_decryptor_system_nss.cc',
3899 'browser/importer/nss_decryptor_system_nss.h', 3899 'browser/importer/nss_decryptor_system_nss.h',
3900 'browser/power_save_blocker_stub.cc', 3900 'browser/power_save_blocker_stub.cc',
3901 'browser/ui/pk11_password_dialog_nss.cc', 3901 'browser/ui/crypto_module_password_dialog_nss.cc',
3902 'browser/ui/views/keyboard_overlay_delegate.cc', 3902 'browser/ui/views/keyboard_overlay_delegate.cc',
3903 'browser/ui/views/select_file_dialog.cc', 3903 'browser/ui/views/select_file_dialog.cc',
3904 ], 3904 ],
3905 'conditions': [ 3905 'conditions': [
3906 ['win_use_allocator_shim==1', { 3906 ['win_use_allocator_shim==1', {
3907 'dependencies': [ 3907 'dependencies': [
3908 '<(allocator_target)', 3908 '<(allocator_target)',
3909 ], 3909 ],
3910 }], 3910 }],
3911 ], 3911 ],
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
4215 ['include', '^browser/gtk/import_progress_dialog_gtk.h'], 4215 ['include', '^browser/gtk/import_progress_dialog_gtk.h'],
4216 ['include', '^browser/gtk/import_lock_dialog_gtk.cc'], 4216 ['include', '^browser/gtk/import_lock_dialog_gtk.cc'],
4217 ['include', '^browser/gtk/import_lock_dialog_gtk.h'], 4217 ['include', '^browser/gtk/import_lock_dialog_gtk.h'],
4218 ['include', '^browser/gtk/keyword_editor_view.cc'], 4218 ['include', '^browser/gtk/keyword_editor_view.cc'],
4219 ['include', '^browser/gtk/keyword_editor_view.h'], 4219 ['include', '^browser/gtk/keyword_editor_view.h'],
4220 ['include', '^browser/gtk/nine_box.cc'], 4220 ['include', '^browser/gtk/nine_box.cc'],
4221 ['include', '^browser/gtk/nine_box.h'], 4221 ['include', '^browser/gtk/nine_box.h'],
4222 ['include', '^browser/gtk/options/'], 4222 ['include', '^browser/gtk/options/'],
4223 ['include', '^browser/gtk/owned_widget_gtk.cc'], 4223 ['include', '^browser/gtk/owned_widget_gtk.cc'],
4224 ['include', '^browser/gtk/owned_widget_gtk.h'], 4224 ['include', '^browser/gtk/owned_widget_gtk.h'],
4225 ['include', '^browser/gtk/pk11_password_dialog.cc'], 4225 ['include', '^browser/gtk/crypto_module_password_dialog.cc'],
4226 ['include', '^browser/gtk/pk11_password_dialog.h'],
4227 ['include', '^browser/gtk/popup_blocked_animation_gtk.cc'], 4226 ['include', '^browser/gtk/popup_blocked_animation_gtk.cc'],
4228 ['include', '^browser/gtk/repost_form_warning_gtk.cc'], 4227 ['include', '^browser/gtk/repost_form_warning_gtk.cc'],
4229 ['include', '^browser/gtk/repost_form_warning_gtk.h'], 4228 ['include', '^browser/gtk/repost_form_warning_gtk.h'],
4230 ['include', '^browser/gtk/ssl_client_certificate_selector.cc'], 4229 ['include', '^browser/gtk/ssl_client_certificate_selector.cc'],
4231 ['include', '^browser/gtk/tab_contents_drag_source.cc'], 4230 ['include', '^browser/gtk/tab_contents_drag_source.cc'],
4232 ['include', '^browser/gtk/tab_contents_drag_source.h'], 4231 ['include', '^browser/gtk/tab_contents_drag_source.h'],
4233 ['include', '^browser/gtk/task_manager_gtk.cc'], 4232 ['include', '^browser/gtk/task_manager_gtk.cc'],
4234 ['include', '^browser/gtk/task_manager_gtk.h'], 4233 ['include', '^browser/gtk/task_manager_gtk.h'],
4235 ['include', '^browser/gtk/view_id_util.cc'], 4234 ['include', '^browser/gtk/view_id_util.cc'],
4236 ['include', '^browser/gtk/view_id_util.h'], 4235 ['include', '^browser/gtk/view_id_util.h'],
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
4374 'browser/history_view.cc', 4373 'browser/history_view.cc',
4375 'browser/ime_input.cc', 4374 'browser/ime_input.cc',
4376 'browser/importer/ie_importer.cc', 4375 'browser/importer/ie_importer.cc',
4377 ], 4376 ],
4378 }], 4377 }],
4379 [ 'use_openssl==1', { 4378 [ 'use_openssl==1', {
4380 'sources!': [ 4379 'sources!': [
4381 'browser/importer/nss_decryptor.cc', 4380 'browser/importer/nss_decryptor.cc',
4382 'browser/importer/nss_decryptor_system_nss.cc', 4381 'browser/importer/nss_decryptor_system_nss.cc',
4383 'browser/importer/nss_decryptor_system_nss.h', 4382 'browser/importer/nss_decryptor_system_nss.h',
4384 'browser/ui/pk11_password_dialog_nss.cc', 4383 'browser/ui/crypto_module_password_dialog_nss.cc',
4385 ], 4384 ],
4386 }], 4385 }],
4387 ], 4386 ],
4388 }, 4387 },
4389 { 4388 {
4390 # Protobuf compiler / generate rule for feedback 4389 # Protobuf compiler / generate rule for feedback
4391 'target_name': 'userfeedback_proto', 4390 'target_name': 'userfeedback_proto',
4392 'type': 'none', 4391 'type': 'none',
4393 'sources': [ 4392 'sources': [
4394 'browser/userfeedback/proto/annotations.proto', 4393 'browser/userfeedback/proto/annotations.proto',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
4531 ], 4530 ],
4532 }, 4531 },
4533 ], 4532 ],
4534 } 4533 }
4535 4534
4536 # Local Variables: 4535 # Local Variables:
4537 # tab-width:2 4536 # tab-width:2
4538 # indent-tabs-mode:nil 4537 # indent-tabs-mode:nil
4539 # End: 4538 # End:
4540 # vim: set expandtab tabstop=2 shiftwidth=2: 4539 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698