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

Unified Diff: trunk/src/media/media.gyp

Issue 22871007: Revert 217768 "Adding key press detection in the browser process." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | « trunk/src/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: trunk/src/media/media.gyp
===================================================================
--- trunk/src/media/media.gyp (revision 217773)
+++ trunk/src/media/media.gyp (working copy)
@@ -304,11 +304,6 @@
'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',
@@ -546,7 +541,6 @@
['include', '^base/media\\.cc$'],
['include', '^base/media_stub\\.cc$'],
['include', '^base/media_switches\\.'],
- ['include', '^base/user_input_monitor\\.'],
['include', '^base/vector_math\\.'],
],
'link_settings': {
@@ -557,9 +551,6 @@
'$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
],
},
- 'defines': [
- 'DISABLE_USER_INPUT_MONITOR',
- ],
}],
['OS=="android"', {
'link_settings': {
@@ -587,9 +578,6 @@
],
}],
],
- 'defines': [
- 'DISABLE_USER_INPUT_MONITOR',
- ],
}],
# A simple WebM encoder for animated avatars on ChromeOS.
['chromeos==1', {
@@ -603,15 +591,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': {
@@ -647,16 +626,8 @@
'-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 | « trunk/src/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