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

Side by Side Diff: base/base.gypi

Issue 17078005: Move message_pump to base/message_loop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « base/base.gyp ('k') | base/mac/scoped_sending_event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 'memory/singleton.cc', 293 'memory/singleton.cc',
294 'memory/singleton.h', 294 'memory/singleton.h',
295 'memory/weak_ptr.cc', 295 'memory/weak_ptr.cc',
296 'memory/weak_ptr.h', 296 'memory/weak_ptr.h',
297 'message_loop/message_loop.cc', 297 'message_loop/message_loop.cc',
298 'message_loop/message_loop.h', 298 'message_loop/message_loop.h',
299 'message_loop/message_loop_proxy.cc', 299 'message_loop/message_loop_proxy.cc',
300 'message_loop/message_loop_proxy.h', 300 'message_loop/message_loop_proxy.h',
301 'message_loop/message_loop_proxy_impl.cc', 301 'message_loop/message_loop_proxy_impl.cc',
302 'message_loop/message_loop_proxy_impl.h', 302 'message_loop/message_loop_proxy_impl.h',
303 'message_pump.cc', 303 'message_loop/message_pump.cc',
304 'message_pump.h', 304 'message_loop/message_pump.h',
305 'message_pump_android.cc', 305 'message_loop/message_pump_android.cc',
306 'message_pump_android.h', 306 'message_loop/message_pump_android.h',
307 'message_pump_default.cc', 307 'message_loop/message_pump_default.cc',
308 'message_pump_default.h', 308 'message_loop/message_pump_default.h',
309 'message_pump_ozone.cc', 309 'message_loop/message_pump_ozone.cc',
310 'message_pump_ozone.h', 310 'message_loop/message_pump_ozone.h',
311 'message_pump_win.cc', 311 'message_loop/message_pump_win.cc',
312 'message_pump_win.h', 312 'message_loop/message_pump_win.h',
313 'metrics/sample_map.cc', 313 'metrics/sample_map.cc',
314 'metrics/sample_map.h', 314 'metrics/sample_map.h',
315 'metrics/sample_vector.cc', 315 'metrics/sample_vector.cc',
316 'metrics/sample_vector.h', 316 'metrics/sample_vector.h',
317 'metrics/bucket_ranges.cc', 317 'metrics/bucket_ranges.cc',
318 'metrics/bucket_ranges.h', 318 'metrics/bucket_ranges.h',
319 'metrics/histogram.cc', 319 'metrics/histogram.cc',
320 'metrics/histogram.h', 320 'metrics/histogram.h',
321 'metrics/histogram_base.cc', 321 'metrics/histogram_base.cc',
322 'metrics/histogram_base.h', 322 'metrics/histogram_base.h',
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 'msvs_disabled_warnings': [ 640 'msvs_disabled_warnings': [
641 4018, 641 4018,
642 ], 642 ],
643 'target_conditions': [ 643 'target_conditions': [
644 ['<(use_glib)==0 or >(nacl_untrusted_build)==1', { 644 ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
645 'sources/': [ 645 'sources/': [
646 ['exclude', '^nix/'], 646 ['exclude', '^nix/'],
647 ], 647 ],
648 'sources!': [ 648 'sources!': [
649 'atomicops_internals_x86_gcc.cc', 649 'atomicops_internals_x86_gcc.cc',
650 'message_pump_glib.cc', 650 'message_loop/message_pump_glib.cc',
651 'message_pump_aurax11.cc', 651 'message_loop/message_pump_aurax11.cc',
652 ], 652 ],
653 }], 653 }],
654 ['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', { 654 ['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', {
655 'sources!': ['message_pump_gtk.cc'], 655 'sources!': ['message_loop/message_pump_gtk.cc'],
656 }], 656 }],
657 ['(OS != "linux" and <(os_bsd) != 1 and OS != "android") or >(nacl_unt rusted_build)==1', { 657 ['(OS != "linux" and <(os_bsd) != 1 and OS != "android") or >(nacl_unt rusted_build)==1', {
658 'sources!': [ 658 'sources!': [
659 # Not automatically excluded by the *linux.cc rules. 659 # Not automatically excluded by the *linux.cc rules.
660 'linux_util.cc', 660 'linux_util.cc',
661 ], 661 ],
662 }, 662 },
663 ], 663 ],
664 ['>(nacl_untrusted_build)==1', { 664 ['>(nacl_untrusted_build)==1', {
665 'sources!': [ 665 'sources!': [
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 ['include', '^base_paths_mac\\.'], 728 ['include', '^base_paths_mac\\.'],
729 ['include', '^file_util_mac\\.'], 729 ['include', '^file_util_mac\\.'],
730 ['include', '^file_version_info_mac\\.'], 730 ['include', '^file_version_info_mac\\.'],
731 ['include', '^mac/bundle_locations\\.'], 731 ['include', '^mac/bundle_locations\\.'],
732 ['include', '^mac/foundation_util\\.'], 732 ['include', '^mac/foundation_util\\.'],
733 ['include', '^mac/mac_logging\\.'], 733 ['include', '^mac/mac_logging\\.'],
734 ['include', '^mac/objc_property_releaser\\.'], 734 ['include', '^mac/objc_property_releaser\\.'],
735 ['include', '^mac/scoped_mach_port\\.'], 735 ['include', '^mac/scoped_mach_port\\.'],
736 ['include', '^mac/scoped_nsautorelease_pool\\.'], 736 ['include', '^mac/scoped_nsautorelease_pool\\.'],
737 ['include', '^memory/discardable_memory_mac\\.'], 737 ['include', '^memory/discardable_memory_mac\\.'],
738 ['include', '^message_pump_mac\\.'], 738 ['include', '^message_loop/message_pump_mac\\.'],
739 ['include', '^threading/platform_thread_mac\\.'], 739 ['include', '^threading/platform_thread_mac\\.'],
740 ['include', '^strings/sys_string_conversions_mac\\.'], 740 ['include', '^strings/sys_string_conversions_mac\\.'],
741 ['include', '^time_mac\\.'], 741 ['include', '^time_mac\\.'],
742 ['include', '^worker_pool_mac\\.'], 742 ['include', '^worker_pool_mac\\.'],
743 # Exclude all process_util except the minimal implementation 743 # Exclude all process_util except the minimal implementation
744 # needed on iOS (mostly for unit tests). 744 # needed on iOS (mostly for unit tests).
745 ['exclude', '^process_util'], 745 ['exclude', '^process_util'],
746 ['include', '^process_util_ios\\.mm$'], 746 ['include', '^process_util_ios\\.mm$'],
747 ], 747 ],
748 'sources!': [ 748 'sources!': [
749 'message_pump_libevent.cc' 749 'message_loop/message_pump_libevent.cc'
750 ], 750 ],
751 }], 751 }],
752 ['OS == "ios" and _toolset == "host"', { 752 ['OS == "ios" and _toolset == "host"', {
753 'sources/': [ 753 'sources/': [
754 # Copied filename_rules to switch from iOS to Mac inclusions. 754 # Copied filename_rules to switch from iOS to Mac inclusions.
755 ['include', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'], 755 ['include', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'],
756 ['include', '(^|/)(cocoa|mac)/'], 756 ['include', '(^|/)(cocoa|mac)/'],
757 ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'], 757 ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'],
758 ['exclude', '(^|/)ios/'], 758 ['exclude', '(^|/)ios/'],
759 ] 759 ]
(...skipping 22 matching lines...) Expand all
782 }, 782 },
783 ], 783 ],
784 ['OS == "win" and >(nacl_untrusted_build)==0', { 784 ['OS == "win" and >(nacl_untrusted_build)==0', {
785 'include_dirs': [ 785 'include_dirs': [
786 '<(DEPTH)/third_party/wtl/include', 786 '<(DEPTH)/third_party/wtl/include',
787 ], 787 ],
788 'sources!': [ 788 'sources!': [
789 'event_recorder_stubs.cc', 789 'event_recorder_stubs.cc',
790 'files/file_path_watcher_kqueue.cc', 790 'files/file_path_watcher_kqueue.cc',
791 'files/file_path_watcher_stub.cc', 791 'files/file_path_watcher_stub.cc',
792 'message_pump_libevent.cc', 792 'message_loop/message_pump_libevent.cc',
793 'posix/file_descriptor_shuffle.cc', 793 'posix/file_descriptor_shuffle.cc',
794 # Not using sha1_win.cc because it may have caused a 794 # Not using sha1_win.cc because it may have caused a
795 # regression to page cycler moz. 795 # regression to page cycler moz.
796 'sha1_win.cc', 796 'sha1_win.cc',
797 'strings/string16.cc', 797 'strings/string16.cc',
798 ], 798 ],
799 },], 799 },],
800 ['<(use_ozone) == 1', { 800 ['<(use_ozone) == 1', {
801 'sources!': [ 801 'sources!': [
802 'message_pump_glib.cc', 802 'message_loop/message_pump_glib.cc',
803 'message_pump_aurax11.cc', 803 'message_loop/message_pump_aurax11.cc',
804 ] 804 ]
805 }], 805 }],
806 ['OS == "linux" and >(nacl_untrusted_build)==0', { 806 ['OS == "linux" and >(nacl_untrusted_build)==0', {
807 'sources!': [ 807 'sources!': [
808 'files/file_path_watcher_kqueue.cc', 808 'files/file_path_watcher_kqueue.cc',
809 'files/file_path_watcher_stub.cc', 809 'files/file_path_watcher_stub.cc',
810 ], 810 ],
811 }], 811 }],
812 ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', { 812 ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', {
813 'sources/': [ 813 'sources/': [
(...skipping 26 matching lines...) Expand all
840 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', { 840 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
841 'sources/': [ 841 'sources/': [
842 ['exclude', '^third_party/nspr/'], 842 ['exclude', '^third_party/nspr/'],
843 ], 843 ],
844 }], 844 }],
845 ], 845 ],
846 }], 846 }],
847 ], 847 ],
848 }, 848 },
849 } 849 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | base/mac/scoped_sending_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698