diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 13:24:19 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 13:24:19 +0000 |
| commit | 6d84e25c26ee33424552e36fe05b7724cbe0a676 (patch) | |
| tree | 042e8cb57e7d0ae9425f274d0f0942752e51ee1f /chromeos/dbus/volume_state.cc | |
| parent | 2a1eb8883ca7e9d89a34029448db3345844a4547 (diff) | |
| download | chromium_src-6d84e25c26ee33424552e36fe05b7724cbe0a676.zip chromium_src-6d84e25c26ee33424552e36fe05b7724cbe0a676.tar.gz chromium_src-6d84e25c26ee33424552e36fe05b7724cbe0a676.tar.bz2 | |
Integrate cras audio dbus api changes for transiting from SetOyutputMute to SetOutputUserMute into chrome.
BUG=244597
Review URL: https://chromiumcodereview.appspot.com/18224003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/volume_state.cc')
| -rw-r--r-- | chromeos/dbus/volume_state.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromeos/dbus/volume_state.cc b/chromeos/dbus/volume_state.cc index 7961520..9f105c4 100644 --- a/chromeos/dbus/volume_state.cc +++ b/chromeos/dbus/volume_state.cc @@ -11,9 +11,10 @@ namespace chromeos { VolumeState::VolumeState() : output_volume(0), - output_mute(false), + output_system_mute(false), input_gain(0), - input_mute(false) { + input_mute(false), + output_user_mute(false) { } std::string VolumeState::ToString() const { @@ -22,18 +23,17 @@ std::string VolumeState::ToString() const { "output_volume = %d ", output_volume); base::StringAppendF(&result, - "output_mute = %s ", - output_mute ? "true" : "false"); - base::StringAppendF(&result, - "output_mute = %s ", - output_mute ? "true" : "false"); + "output_system_mute = %s ", + output_system_mute ? "true" : "false"); base::StringAppendF(&result, "input_gain = %d ", input_gain); base::StringAppendF(&result, "input_mute = %s ", input_mute ? "true" : "false"); - + base::StringAppendF(&result, + "output_user_mute = %s ", + output_user_mute ? "true" : "false"); return result; } |