summaryrefslogtreecommitdiffstats
path: root/chromeos/audio
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 08:38:48 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 08:38:48 +0000
commitbb4167536d5310f10effb7fa0d3700c6957f1787 (patch)
tree9334775d2121260487f42a9d906d236dc21042ad /chromeos/audio
parent69d7a49c29abea1f2d1c6ec71551e9b049843e55 (diff)
downloadchromium_src-bb4167536d5310f10effb7fa0d3700c6957f1787.zip
chromium_src-bb4167536d5310f10effb7fa0d3700c6957f1787.tar.gz
chromium_src-bb4167536d5310f10effb7fa0d3700c6957f1787.tar.bz2
Revert 251959 "Refactor the TrayAudio code so that it can be use..."
Reverted due to memory leaks: http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASAN%20Tests%20%281%29/builds/15922 > Refactor the TrayAudio code so that it can be used by other platforms. > The motivation here is to introduce the volume slider tray UI into > Windows Ash. > > This change does not actually add tray audio UI to other platforms, > only moves some non-chromeos specific things out of the chromeos > platform folders, so that we can hook in the native Audio APIs > of other platforms to the tray UI. > > At a high level, this change does the following: > > 1) Move tray_audio out of chromeos/ so that other platforms can > use the UI that it provides. > 2) Decouples TrayAudio from CrasAudioHandler by introducing a > new delegate, in a similar vein to what is done with all the other > handlers (e.g. the BluetoothHandler) > 3) Move the additional views (VolumeView, etc) to their own files > so they can be used by other platforms as well. > > TEST= > On CrOS physical device, verified that: > 1) Keyboard volume buttons function appropriately and display the > volume view > 2) AudioDetailView still is accessible at the correct times > 3) Adjusting the volume (via the keyboard shortcuts or via the > slider) correctly change the output volume. > 4) UI still behaves correctly (e.g. icons update as the volume > changes, mute button works, etc). > > BUG=227247 > > Review URL: https://codereview.chromium.org/163953007 TBR=zturner@chromium.org Review URL: https://codereview.chromium.org/170843009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/audio')
-rw-r--r--chromeos/audio/cras_audio_handler.cc4
-rw-r--r--chromeos/audio/cras_audio_handler.h3
2 files changed, 0 insertions, 7 deletions
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc
index fd2d92e..0045f84 100644
--- a/chromeos/audio/cras_audio_handler.cc
+++ b/chromeos/audio/cras_audio_handler.cc
@@ -130,10 +130,6 @@ bool CrasAudioHandler::IsInputMutedForDevice(uint64 device_id) {
return audio_pref_handler_->GetMuteValue(*device);
}
-int CrasAudioHandler::GetOutputDefaultVolumeMuteThreshold() {
- return kMuteThresholdPercent;
-}
-
int CrasAudioHandler::GetOutputVolumePercent() {
return output_volume_;
}
diff --git a/chromeos/audio/cras_audio_handler.h b/chromeos/audio/cras_audio_handler.h
index cc28c50..f2a35a5 100644
--- a/chromeos/audio/cras_audio_handler.h
+++ b/chromeos/audio/cras_audio_handler.h
@@ -99,9 +99,6 @@ class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer,
// Returns true if the output volume is below the default mute volume level.
virtual bool IsOutputVolumeBelowDefaultMuteLvel();
- // Returns volume level in 0-100% range at which the volume should be muted.
- virtual int GetOutputDefaultVolumeMuteThreshold();
-
// Gets volume level in 0-100% range (0 being pure silence) for the current
// active node.
virtual int GetOutputVolumePercent();