Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'dependencies': [ | 6 'dependencies': [ |
| 7 '../base/base.gyp:base', | 7 '../base/base.gyp:base', |
| 8 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', | 8 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', |
| 9 '../cc/cc.gyp:cc', | 9 '../cc/cc.gyp:cc', |
| 10 '../cc/blink/cc_blink.gyp:cc_blink', | 10 '../cc/blink/cc_blink.gyp:cc_blink', |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 'renderer/android/email_detector.cc', | 101 'renderer/android/email_detector.cc', |
| 102 'renderer/android/email_detector.h', | 102 'renderer/android/email_detector.h', |
| 103 'renderer/android/phone_number_detector.cc', | 103 'renderer/android/phone_number_detector.cc', |
| 104 'renderer/android/phone_number_detector.h', | 104 'renderer/android/phone_number_detector.h', |
| 105 'renderer/android/renderer_date_time_picker.cc', | 105 'renderer/android/renderer_date_time_picker.cc', |
| 106 'renderer/android/renderer_date_time_picker.h', | 106 'renderer/android/renderer_date_time_picker.h', |
| 107 'renderer/android/synchronous_compositor_external_begin_frame_source.cc', | 107 'renderer/android/synchronous_compositor_external_begin_frame_source.cc', |
| 108 'renderer/android/synchronous_compositor_external_begin_frame_source.h', | 108 'renderer/android/synchronous_compositor_external_begin_frame_source.h', |
| 109 'renderer/android/synchronous_compositor_factory.cc', | 109 'renderer/android/synchronous_compositor_factory.cc', |
| 110 'renderer/android/synchronous_compositor_factory.h', | 110 'renderer/android/synchronous_compositor_factory.h', |
| 111 'renderer/android/synchronous_compositor_filter.cc', | 111 'renderer/android/synchronous_compositor_filter.cc', |
|
minyue
2015/11/12 16:52:31
I suppose these come from rebasing.
A trick for f
ajose
2015/11/13 00:22:44
Good point. I'm in the bad habit of deleting every
| |
| 112 'renderer/android/synchronous_compositor_filter.h', | 112 'renderer/android/synchronous_compositor_filter.h', |
| 113 'renderer/android/synchronous_compositor_output_surface.cc', | 113 'renderer/android/synchronous_compositor_output_surface.cc', |
| 114 'renderer/android/synchronous_compositor_output_surface.h', | 114 'renderer/android/synchronous_compositor_output_surface.h', |
| 115 'renderer/android/synchronous_compositor_proxy.cc', | 115 'renderer/android/synchronous_compositor_proxy.cc', |
| 116 'renderer/android/synchronous_compositor_proxy.h', | 116 'renderer/android/synchronous_compositor_proxy.h', |
| 117 'renderer/android/synchronous_compositor_registry.h', | 117 'renderer/android/synchronous_compositor_registry.h', |
| 118 'renderer/background_sync/background_sync_client_impl.cc', | 118 'renderer/background_sync/background_sync_client_impl.cc', |
| 119 'renderer/background_sync/background_sync_client_impl.h', | 119 'renderer/background_sync/background_sync_client_impl.h', |
| 120 'renderer/battery_status/battery_status_dispatcher.cc', | 120 'renderer/battery_status/battery_status_dispatcher.cc', |
| 121 'renderer/battery_status/battery_status_dispatcher.h', | 121 'renderer/battery_status/battery_status_dispatcher.h', |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 620 'public/renderer/media_stream_sink.h', | 620 'public/renderer/media_stream_sink.h', |
| 621 'public/renderer/media_stream_video_sink.cc', | 621 'public/renderer/media_stream_video_sink.cc', |
| 622 'public/renderer/media_stream_video_sink.h', | 622 'public/renderer/media_stream_video_sink.h', |
| 623 'public/renderer/webrtc_log_message_delegate.h', | 623 'public/renderer/webrtc_log_message_delegate.h', |
| 624 ], | 624 ], |
| 625 # WebRTC-specific sources. Put WebRTC plugin-related stuff in the | 625 # WebRTC-specific sources. Put WebRTC plugin-related stuff in the |
| 626 # Plugin+WebRTC section below. | 626 # Plugin+WebRTC section below. |
| 627 'private_renderer_webrtc_sources': [ | 627 'private_renderer_webrtc_sources': [ |
| 628 'renderer/media/audio_repetition_detector.cc', | 628 'renderer/media/audio_repetition_detector.cc', |
| 629 'renderer/media/audio_repetition_detector.h', | 629 'renderer/media/audio_repetition_detector.h', |
| 630 'renderer/media/audio_track_recorder.cc', | |
| 631 'renderer/media/audio_track_recorder.h', | |
| 630 'renderer/media/media_recorder_handler.cc', | 632 'renderer/media/media_recorder_handler.cc', |
| 631 'renderer/media/media_recorder_handler.h', | 633 'renderer/media/media_recorder_handler.h', |
| 632 'renderer/media/media_stream.cc', | 634 'renderer/media/media_stream.cc', |
| 633 'renderer/media/media_stream.h', | 635 'renderer/media/media_stream.h', |
| 634 'renderer/media/media_stream_audio_processor.cc', | 636 'renderer/media/media_stream_audio_processor.cc', |
| 635 'renderer/media/media_stream_audio_processor.h', | 637 'renderer/media/media_stream_audio_processor.h', |
| 636 'renderer/media/media_stream_audio_processor_options.cc', | 638 'renderer/media/media_stream_audio_processor_options.cc', |
| 637 'renderer/media/media_stream_audio_processor_options.h', | 639 'renderer/media/media_stream_audio_processor_options.h', |
| 638 'renderer/media/media_stream_audio_sink_owner.cc', | 640 'renderer/media/media_stream_audio_sink_owner.cc', |
| 639 'renderer/media/media_stream_audio_sink_owner.h', | 641 'renderer/media/media_stream_audio_sink_owner.h', |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 792 ], | 794 ], |
| 793 }], | 795 }], |
| 794 ['OS=="win" and win_use_allocator_shim==1', { | 796 ['OS=="win" and win_use_allocator_shim==1', { |
| 795 'dependencies': [ | 797 'dependencies': [ |
| 796 '../base/allocator/allocator.gyp:allocator', | 798 '../base/allocator/allocator.gyp:allocator', |
| 797 ], | 799 ], |
| 798 }], | 800 }], |
| 799 ['OS=="android"', { | 801 ['OS=="android"', { |
| 800 'sources!': [ | 802 'sources!': [ |
| 801 'renderer/media/audio_decoder.cc', | 803 'renderer/media/audio_decoder.cc', |
| 804 'renderer/media/audio_track_recorder.cc', | |
| 805 'renderer/media/audio_track_recorder.h', | |
| 802 'renderer/media/media_recorder_handler.cc', | 806 'renderer/media/media_recorder_handler.cc', |
| 803 'renderer/media/media_recorder_handler.h', | 807 'renderer/media/media_recorder_handler.h', |
| 804 'renderer/media/video_track_recorder.cc', | 808 'renderer/media/video_track_recorder.cc', |
| 805 'renderer/media/video_track_recorder.h', | 809 'renderer/media/video_track_recorder.h', |
| 806 'renderer/usb/type_converters.cc', | 810 'renderer/usb/type_converters.cc', |
| 807 'renderer/usb/type_converters.h', | 811 'renderer/usb/type_converters.h', |
| 808 'renderer/usb/web_usb_client_impl.cc', | 812 'renderer/usb/web_usb_client_impl.cc', |
| 809 'renderer/usb/web_usb_client_impl.h', | 813 'renderer/usb/web_usb_client_impl.h', |
| 810 'renderer/usb/web_usb_device_impl.cc', | 814 'renderer/usb/web_usb_device_impl.cc', |
| 811 'renderer/usb/web_usb_device_impl.h', | 815 'renderer/usb/web_usb_device_impl.h', |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 924 }], | 928 }], |
| 925 ], | 929 ], |
| 926 'target_conditions': [ | 930 'target_conditions': [ |
| 927 ['OS=="android"', { | 931 ['OS=="android"', { |
| 928 'sources/': [ | 932 'sources/': [ |
| 929 ['include', '^renderer/render_view_linux\\.cc$'], | 933 ['include', '^renderer/render_view_linux\\.cc$'], |
| 930 ], | 934 ], |
| 931 }], | 935 }], |
| 932 ], | 936 ], |
| 933 } | 937 } |
| OLD | NEW |