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

Unified Diff: media/media.gyp

Issue 23702008: Adds the UserInputMonitor implementation for Windows. (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 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 1bdcbcacde0d8464abe592783978b6bdc7a22c9b..eda33b6bad8382776d0795e22c9bb679e6b32f8c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -548,15 +548,6 @@
'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': {
@@ -635,8 +626,6 @@
'audio/cras/cras_input.h',
'audio/cras/cras_unified.cc',
'audio/cras/cras_unified.h',
- 'base/keyboard_event_counter.cc',
- 'base/keyboard_event_counter.h',
],
}],
['use_pulseaudio==1', {
@@ -830,6 +819,12 @@
'ENABLE_EAC3_PLAYBACK',
],
}],
+ ['OS!="linux" and OS!="win"', {
+ 'sources!': [
+ 'base/keyboard_event_counter.cc',
+ 'base/keyboard_event_counter.h',
+ ],
+ }],
],
},
{
@@ -912,6 +907,7 @@
'base/sinc_resampler_unittest.cc',
'base/test_data_util.cc',
'base/test_data_util.h',
+ 'base/user_input_monitor_unittest.cc',
'base/vector_math_testing.h',
'base/vector_math_unittest.cc',
'base/video_frame_unittest.cc',
« 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