diff options
| author | davej@chromium.org <davej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 00:52:12 +0000 |
|---|---|---|
| committer | davej@chromium.org <davej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 00:52:12 +0000 |
| commit | 5fbc3638abc89b0668dfe598d57b6347343ea0c8 (patch) | |
| tree | 8f1925f8e078b216dea19385eceae22671bf993f /chrome/browser/prefs | |
| parent | ee284a1c31d2dec5ae7cfb3bb79b070c54fc06b4 (diff) | |
| download | chromium_src-5fbc3638abc89b0668dfe598d57b6347343ea0c8.zip chromium_src-5fbc3638abc89b0668dfe598d57b6347343ea0c8.tar.gz chromium_src-5fbc3638abc89b0668dfe598d57b6347343ea0c8.tar.bz2 | |
Save/Restore ALSA volume/mute
When the ALSA volume mixer is used (if PulseAudio is disabled), the current volume and mute settings will be stored in the browser prefs so they can be restored when starting a new session.
BUG=chrome-os:10470
TEST=Manual, volume and mute setting via keyboard should persist after rebooting.
Review URL: http://codereview.chromium.org/6118006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index a90aed0..88e4b13 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -65,6 +65,7 @@ #endif #if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/audio_mixer_alsa.h" #include "chrome/browser/chromeos/login/apply_services_customization.h" #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" #include "chrome/browser/chromeos/login/user_manager.h" @@ -103,6 +104,7 @@ void RegisterLocalState(PrefService* local_state) { BackgroundPageTracker::RegisterPrefs(local_state); NotificationUIManager::RegisterPrefs(local_state); #if defined(OS_CHROMEOS) + chromeos::AudioMixerAlsa::RegisterPrefs(local_state); chromeos::UserManager::RegisterPrefs(local_state); chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); WizardController::RegisterPrefs(local_state); |