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

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, 3 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 'base/decryptor.cc', 251 'base/decryptor.cc',
252 'base/decryptor.h', 252 'base/decryptor.h',
253 'base/demuxer.cc', 253 'base/demuxer.cc',
254 'base/demuxer.h', 254 'base/demuxer.h',
255 'base/demuxer_stream.cc', 255 'base/demuxer_stream.cc',
256 'base/demuxer_stream.h', 256 'base/demuxer_stream.h',
257 'base/djb2.cc', 257 'base/djb2.cc',
258 'base/djb2.h', 258 'base/djb2.h',
259 'base/filter_collection.cc', 259 'base/filter_collection.cc',
260 'base/filter_collection.h', 260 'base/filter_collection.h',
261 'base/keyboard_event_counter.cc',
262 'base/keyboard_event_counter.h',
261 'base/media.cc', 263 'base/media.cc',
262 'base/media.h', 264 'base/media.h',
263 'base/media_file_checker.cc', 265 'base/media_file_checker.cc',
264 'base/media_file_checker.h', 266 'base/media_file_checker.h',
265 'base/media_keys.cc', 267 'base/media_keys.cc',
266 'base/media_keys.h', 268 'base/media_keys.h',
267 'base/media_log.cc', 269 'base/media_log.cc',
268 'base/media_log.h', 270 'base/media_log.h',
269 'base/media_log_event.h', 271 'base/media_log_event.h',
270 'base/media_posix.cc', 272 'base/media_posix.cc',
(...skipping 26 matching lines...) Expand all
297 'base/sinc_resampler.cc', 299 'base/sinc_resampler.cc',
298 'base/sinc_resampler.h', 300 'base/sinc_resampler.h',
299 'base/stream_parser.cc', 301 'base/stream_parser.cc',
300 'base/stream_parser.h', 302 'base/stream_parser.h',
301 'base/stream_parser_buffer.cc', 303 'base/stream_parser_buffer.cc',
302 'base/stream_parser_buffer.h', 304 'base/stream_parser_buffer.h',
303 'base/text_track.h', 305 'base/text_track.h',
304 'base/user_input_monitor.cc', 306 'base/user_input_monitor.cc',
305 'base/user_input_monitor.h', 307 'base/user_input_monitor.h',
306 'base/user_input_monitor_linux.cc', 308 'base/user_input_monitor_linux.cc',
307 'base/user_input_monitor_mac.mm', 309 'base/user_input_monitor_mac.cc',
308 'base/user_input_monitor_win.cc', 310 'base/user_input_monitor_win.cc',
309 'base/video_decoder.cc', 311 'base/video_decoder.cc',
310 'base/video_decoder.h', 312 'base/video_decoder.h',
311 'base/video_decoder_config.cc', 313 'base/video_decoder_config.cc',
312 'base/video_decoder_config.h', 314 'base/video_decoder_config.h',
313 'base/video_frame.cc', 315 'base/video_frame.cc',
314 'base/video_frame.h', 316 'base/video_frame.h',
315 'base/video_renderer.cc', 317 'base/video_renderer.cc',
316 'base/video_renderer.h', 318 'base/video_renderer.h',
317 'base/video_util.cc', 319 'base/video_util.cc',
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 ], 682 ],
681 }], 683 }],
682 ['OS!="linux"', { 684 ['OS!="linux"', {
683 'sources!': [ 685 'sources!': [
684 'audio/cras/audio_manager_cras.cc', 686 'audio/cras/audio_manager_cras.cc',
685 'audio/cras/audio_manager_cras.h', 687 'audio/cras/audio_manager_cras.h',
686 'audio/cras/cras_input.cc', 688 'audio/cras/cras_input.cc',
687 'audio/cras/cras_input.h', 689 'audio/cras/cras_input.h',
688 'audio/cras/cras_unified.cc', 690 'audio/cras/cras_unified.cc',
689 'audio/cras/cras_unified.h', 691 'audio/cras/cras_unified.h',
692 'base/keyboard_event_counter.cc',
693 'base/keyboard_event_counter.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)',
695 ], 699 ],
696 'defines': [ 700 'defines': [
697 'USE_PULSEAUDIO', 701 'USE_PULSEAUDIO',
698 ], 702 ],
699 'conditions': [ 703 'conditions': [
(...skipping 974 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