Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: chromeos/audio/audio_devices_pref_handler_impl.cc

Issue 817013002: cros: Remove system-level policy for audio capture allowed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (allow-audio) rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/audio/audio_devices_pref_handler_impl.cc
diff --git a/chromeos/audio/audio_devices_pref_handler_impl.cc b/chromeos/audio/audio_devices_pref_handler_impl.cc
index d26236942586c862ed3ee2d93160d4312cce87e5..4e72de6c1ca6ac4bf2e597d3330e5a502170583e 100644
--- a/chromeos/audio/audio_devices_pref_handler_impl.cc
+++ b/chromeos/audio/audio_devices_pref_handler_impl.cc
@@ -85,14 +85,6 @@ void AudioDevicesPrefHandlerImpl::SetMuteValue(const AudioDevice& device,
SaveDevicesMutePref();
}
-
-bool AudioDevicesPrefHandlerImpl::GetAudioCaptureAllowedValue() {
- if (audio_capture_allowed_pref_.empty())
- return true;
-
- return local_state_->GetBoolean(audio_capture_allowed_pref_);
-}
-
bool AudioDevicesPrefHandlerImpl::GetAudioOutputAllowedValue() {
return local_state_->GetBoolean(prefs::kAudioOutputAllowed);
}
@@ -135,12 +127,10 @@ double AudioDevicesPrefHandlerImpl::GetDeviceDefaultOutputVolume(
}
AudioDevicesPrefHandlerImpl::AudioDevicesPrefHandlerImpl(
- PrefService* local_state,
- const std::string& audio_capture_allowed_pref)
+ PrefService* local_state)
: device_mute_settings_(new base::DictionaryValue()),
device_volume_settings_(new base::DictionaryValue()),
- local_state_(local_state),
- audio_capture_allowed_pref_(audio_capture_allowed_pref) {
+ local_state_(local_state) {
InitializePrefObservers();
UpdateDevicesMutePref();
@@ -156,9 +146,6 @@ void AudioDevicesPrefHandlerImpl::InitializePrefObservers() {
base::Bind(&AudioDevicesPrefHandlerImpl::NotifyAudioPolicyChange,
base::Unretained(this));
pref_change_registrar_.Add(prefs::kAudioOutputAllowed, callback);
-
- if (!audio_capture_allowed_pref_.empty())
- pref_change_registrar_.Add(audio_capture_allowed_pref_, callback);
}
void AudioDevicesPrefHandlerImpl::UpdateDevicesMutePref() {
@@ -220,23 +207,15 @@ void AudioDevicesPrefHandlerImpl::NotifyAudioPolicyChange() {
}
// static
-void AudioDevicesPrefHandlerImpl::RegisterPrefs(
- PrefRegistrySimple* registry,
- const std::string& audio_capture_allowed_pref) {
+void AudioDevicesPrefHandlerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterDictionaryPref(prefs::kAudioDevicesVolumePercent);
registry->RegisterDictionaryPref(prefs::kAudioDevicesMute);
// Register the prefs backing the audio muting policies.
+ // Policy for audio input is handled by kAudioCaptureAllowed in the Chrome
+ // media system.
registry->RegisterBooleanPref(prefs::kAudioOutputAllowed, true);
- // This pref has moved to the media subsystem but we should verify it is there
- // before we use it.
- // NOTE: This registers the pref in the device-wide local state pref registry.
- // In Chrome the media subsystem also registers kAudioCaptureAllowed in the
- // per-user profile pref registry.
- if (!audio_capture_allowed_pref.empty())
- registry->RegisterBooleanPref(audio_capture_allowed_pref, true);
-
// Register the legacy audio prefs for migration.
registry->RegisterDoublePref(prefs::kAudioVolumePercent,
kDefaultOutputVolumePercent);
« no previous file with comments | « chromeos/audio/audio_devices_pref_handler_impl.h ('k') | chromeos/audio/audio_devices_pref_handler_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698