diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 03:28:22 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 03:28:22 +0000 |
| commit | d7b0883443b3b672a486aedb14db7dcfb7ad0d56 (patch) | |
| tree | aacb61a97b731d7b7b6552413d53f45037917000 /chrome/browser/prefs | |
| parent | 9eb24cf5d1bc44da2d5318fb6794630264ee93cc (diff) | |
| download | chromium_src-d7b0883443b3b672a486aedb14db7dcfb7ad0d56.zip chromium_src-d7b0883443b3b672a486aedb14db7dcfb7ad0d56.tar.gz chromium_src-d7b0883443b3b672a486aedb14db7dcfb7ad0d56.tar.bz2 | |
Implement new audio handler which talks to the new audio dbus apis, and adds a new AudioClientRestarted signal in CrasAudioClient.
BUG=160311,232032
TBR=sky
TBR=battre
Review URL: https://codereview.chromium.org/14314002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 611914f1..47a67b7 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -116,6 +116,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/audio/audio_handler.h" +#include "chrome/browser/chromeos/audio/audio_pref_handler_impl.h" #include "chrome/browser/chromeos/customization_document.h" #include "chrome/browser/chromeos/display/display_preferences.h" #include "chrome/browser/chromeos/login/login_utils.h" @@ -239,7 +240,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #endif #if defined(OS_CHROMEOS) - chromeos::AudioHandler::RegisterPrefs(registry); + chromeos::AudioPrefHandlerImpl::RegisterPrefs(registry); chromeos::DataPromoNotification::RegisterPrefs(registry); chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); chromeos::device_settings_cache::RegisterPrefs(registry); |