summaryrefslogtreecommitdiffstats
path: root/chromeos/chromeos.gyp
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 10:55:57 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 10:55:57 +0000
commitbf9fc82b8e82677ec039a6b9711c0e1aa3647a53 (patch)
tree0fae8f2317ce9db0adbec299973f676c0dea0b87 /chromeos/chromeos.gyp
parent1c36fc4e54a794b9b7119b9267b215d9c58a8d5e (diff)
downloadchromium_src-bf9fc82b8e82677ec039a6b9711c0e1aa3647a53.zip
chromium_src-bf9fc82b8e82677ec039a6b9711c0e1aa3647a53.tar.gz
chromium_src-bf9fc82b8e82677ec039a6b9711c0e1aa3647a53.tar.bz2
Merge the cras audio switch handler with the handler.
This CL also fixes a few bugs with handling mute. R=jennyz@chromium.org BUG=239206 TEST=Tested audio switching with both volume and mute settings. Review URL: https://chromiumcodereview.appspot.com/14915003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/chromeos.gyp')
-rw-r--r--chromeos/chromeos.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 51c532a..7c47b59 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -40,8 +40,6 @@
'audio/cras_audio_handler.h',
'audio/mock_cras_audio_handler.cc',
'audio/mock_cras_audio_handler.h',
- 'audio/cras_audio_switch_handler.cc',
- 'audio/cras_audio_switch_handler.h',
'attestation/attestation_constants.cc',
'attestation/attestation_constants.h',
'attestation/attestation_flow.cc',