| Index: chromeos/audio/audio_devices_pref_handler_impl.h
|
| diff --git a/chromeos/audio/audio_devices_pref_handler_impl.h b/chromeos/audio/audio_devices_pref_handler_impl.h
|
| index ccb423639160691b058d186906fc25d6b2a81c4d..8b760b72b3cffda6ecb37d76f659dae709357b01 100644
|
| --- a/chromeos/audio/audio_devices_pref_handler_impl.h
|
| +++ b/chromeos/audio/audio_devices_pref_handler_impl.h
|
| @@ -23,8 +23,8 @@ namespace chromeos {
|
| class CHROMEOS_EXPORT AudioDevicesPrefHandlerImpl
|
| : public AudioDevicesPrefHandler {
|
| public:
|
| - AudioDevicesPrefHandlerImpl(PrefService* local_state,
|
| - const std::string& audio_capture_allowed_pref);
|
| + // |local_state| is the device-wide preference service.
|
| + explicit AudioDevicesPrefHandlerImpl(PrefService* local_state);
|
|
|
| // Overridden from AudioDevicesPrefHandler.
|
| virtual double GetOutputVolumeValue(const AudioDevice* device) override;
|
| @@ -35,15 +35,13 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandlerImpl
|
| virtual bool GetMuteValue(const AudioDevice& device) override;
|
| virtual void SetMuteValue(const AudioDevice& device, bool mute_on) override;
|
|
|
| - virtual bool GetAudioCaptureAllowedValue() override;
|
| virtual bool GetAudioOutputAllowedValue() override;
|
|
|
| virtual void AddAudioPrefObserver(AudioPrefObserver* observer) override;
|
| virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) override;
|
|
|
| // Registers volume and mute preferences.
|
| - static void RegisterPrefs(PrefRegistrySimple* registry,
|
| - const std::string& audio_capture_allowed_pref);
|
| + static void RegisterPrefs(PrefRegistrySimple* registry);
|
|
|
| protected:
|
| virtual ~AudioDevicesPrefHandlerImpl();
|
| @@ -78,10 +76,6 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandlerImpl
|
|
|
| PrefService* local_state_; // not owned
|
|
|
| - // The name of the preferences to check if audio capture is allowed or the
|
| - // empty string if audio capture is always allowed.
|
| - const std::string audio_capture_allowed_pref_;
|
| -
|
| PrefChangeRegistrar pref_change_registrar_;
|
| ObserverList<AudioPrefObserver> observers_;
|
|
|
|
|