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

Side by Side Diff: media/media.gyp

Issue 22801007: Adds the UserInputMonitor implementation for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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
« no previous file with comments | « media/base/user_input_monitor_mac.mm ('k') | no next file » | 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 'base/sinc_resampler.cc', 297 'base/sinc_resampler.cc',
298 'base/sinc_resampler.h', 298 'base/sinc_resampler.h',
299 'base/stream_parser.cc', 299 'base/stream_parser.cc',
300 'base/stream_parser.h', 300 'base/stream_parser.h',
301 'base/stream_parser_buffer.cc', 301 'base/stream_parser_buffer.cc',
302 'base/stream_parser_buffer.h', 302 'base/stream_parser_buffer.h',
303 'base/text_track.h', 303 'base/text_track.h',
304 'base/user_input_monitor.cc', 304 'base/user_input_monitor.cc',
305 'base/user_input_monitor.h', 305 'base/user_input_monitor.h',
306 'base/user_input_monitor_linux.cc', 306 'base/user_input_monitor_linux.cc',
307 'base/user_input_monitor_mac.mm', 307 'base/user_input_monitor_mac.cc',
308 'base/user_input_monitor_win.cc', 308 'base/user_input_monitor_win.cc',
309 'base/video_decoder.cc', 309 'base/video_decoder.cc',
310 'base/video_decoder.h', 310 'base/video_decoder.h',
311 'base/video_decoder_config.cc', 311 'base/video_decoder_config.cc',
312 'base/video_decoder_config.h', 312 'base/video_decoder_config.h',
313 'base/video_frame.cc', 313 'base/video_frame.cc',
314 'base/video_frame.h', 314 'base/video_frame.h',
315 'base/video_renderer.cc', 315 'base/video_renderer.cc',
316 'base/video_renderer.h', 316 'base/video_renderer.h',
317 'base/video_util.cc', 317 'base/video_util.cc',
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 ['OS=="linux"', { 629 ['OS=="linux"', {
630 'variables': { 630 'variables': {
631 'conditions': [ 631 'conditions': [
632 ['sysroot!=""', { 632 ['sysroot!=""', {
633 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "< (target_arch)"', 633 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "< (target_arch)"',
634 }, { 634 }, {
635 'pkg-config': 'pkg-config' 635 'pkg-config': 'pkg-config'
636 }], 636 }],
637 ], 637 ],
638 }, 638 },
639 'sources': [
640 'base/keyboard_event_counter.cc',
641 'base/keyboard_event_counter.h',
642 ],
639 'conditions': [ 643 'conditions': [
640 ['use_x11==1', { 644 ['use_x11==1', {
641 'link_settings': { 645 'link_settings': {
642 'libraries': [ 646 'libraries': [
643 '-lX11', 647 '-lX11',
644 '-lXdamage', 648 '-lXdamage',
645 '-lXext', 649 '-lXext',
646 '-lXfixes', 650 '-lXfixes',
647 '-lXtst', 651 '-lXtst',
648 ], 652 ],
(...skipping 25 matching lines...) Expand all
674 'audio/cras/cras_input.cc', 678 'audio/cras/cras_input.cc',
675 'audio/cras/cras_input.h', 679 'audio/cras/cras_input.h',
676 'audio/cras/cras_unified.cc', 680 'audio/cras/cras_unified.cc',
677 'audio/cras/cras_unified.h', 681 'audio/cras/cras_unified.h',
678 ], 682 ],
679 }], 683 }],
680 ], 684 ],
681 }], 685 }],
682 ['OS!="linux"', { 686 ['OS!="linux"', {
683 'sources!': [ 687 'sources!': [
684 'audio/cras/audio_manager_cras.cc', 688 'audio/cras/audio_manager_cras.cc',
Mark Mentovai 2013/08/26 15:11:01 We normally use excludes for this: List keyboard_
jiayl 2013/08/26 17:16:58 That won't work when the Windows impl is added. I
Mark Mentovai 2013/08/26 19:07:55 jiayl wrote:
jiayl 2013/08/26 19:30:09 Done. Thanks for the explanation.
685 'audio/cras/audio_manager_cras.h', 689 'audio/cras/audio_manager_cras.h',
686 'audio/cras/cras_input.cc', 690 'audio/cras/cras_input.cc',
687 'audio/cras/cras_input.h', 691 'audio/cras/cras_input.h',
688 'audio/cras/cras_unified.cc', 692 'audio/cras/cras_unified.cc',
689 'audio/cras/cras_unified.h', 693 'audio/cras/cras_unified.h',
690 ], 694 ],
691 }], 695 }],
692 ['use_pulseaudio==1', { 696 ['use_pulseaudio==1', {
693 'cflags': [ 697 'cflags': [
694 '<!@(pkg-config --cflags libpulse)', 698 '<!@(pkg-config --cflags libpulse)',
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
1674 'sources': [ 1678 'sources': [
1675 'tools/media_bench/media_bench.cc', 1679 'tools/media_bench/media_bench.cc',
1676 ], 1680 ],
1677 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1681 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1678 'msvs_disabled_warnings': [ 4267, ], 1682 'msvs_disabled_warnings': [ 4267, ],
1679 }, 1683 },
1680 ], 1684 ],
1681 }], 1685 }],
1682 ], 1686 ],
1683 } 1687 }
OLDNEW
« no previous file with comments | « media/base/user_input_monitor_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698