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

Unified Diff: media/media.gyp

Issue 21183002: Adding key press detection in the browser process. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/user_input_monitor_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index c685090fd17a0fcf169e3043e3aeae5d12cf31df..262c6ed98315d4d8dc37a9ac7133308d5298176e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -302,6 +302,11 @@
'base/stream_parser_buffer.cc',
'base/stream_parser_buffer.h',
'base/text_track.h',
+ 'base/user_input_monitor.cc',
+ 'base/user_input_monitor.h',
+ 'base/user_input_monitor_linux.cc',
+ 'base/user_input_monitor_mac.mm',
+ 'base/user_input_monitor_win.cc',
'base/video_decoder.cc',
'base/video_decoder.h',
'base/video_decoder_config.cc',
@@ -537,6 +542,7 @@
['include', '^base/media\\.cc$'],
['include', '^base/media_stub\\.cc$'],
['include', '^base/media_switches\\.'],
+ ['include', '^base/user_input_monitor\\.'],
['include', '^base/vector_math\\.'],
],
'link_settings': {
@@ -547,6 +553,9 @@
'$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
],
},
+ 'defines': [
+ 'DISABLE_USER_INPUT_MONITOR',
+ ],
}],
['OS=="android"', {
'link_settings': {
@@ -574,6 +583,9 @@
],
}],
],
+ 'defines': [
+ 'DISABLE_USER_INPUT_MONITOR',
+ ],
}],
# A simple WebM encoder for animated avatars on ChromeOS.
['chromeos==1', {
@@ -587,6 +599,15 @@
'webm/chromeos/webm_encoder.cc',
'webm/chromeos/webm_encoder.h',
],
+ 'defines': [
+ # TODO(jiayl): figure out why MediaStreamInfoBarTest.
+ # DenyingCameraDoesNotCauseStickyDenyForMics fails on ChromeOS and
+ # remove this.
+ 'DISABLE_USER_INPUT_MONITOR',
+ ],
+ 'sources!': [
+ 'base/user_input_monitor_linux.cc',
+ ],
}],
['use_alsa==1', {
'link_settings': {
@@ -622,8 +643,16 @@
'-lXdamage',
'-lXext',
'-lXfixes',
+ '-lXtst',
],
},
+ }, { # else: use_x11==0
+ 'sources!': [
+ 'base/user_input_monitor_linux.cc',
+ ],
+ 'defines': [
+ 'DISABLE_USER_INPUT_MONITOR',
+ ],
}],
['use_cras==1', {
'cflags': [
« no previous file with comments | « media/base/user_input_monitor_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698