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

Unified Diff: chrome/common/pref_names.cc

Issue 10873085: Implement two new policies to control muting the audio I/O. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed even more comments. Created 8 years, 4 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: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index c5e94f6305878b9c8befd5a2d9f27e02a39fe0a0..8d63e3dc1af5a64faf8ce0822c6d0ad5e35f89b5 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -494,7 +494,9 @@ const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
const char kDefaultAppsInstallState[] = "default_apps_install_state";
#if defined(OS_CHROMEOS)
-// An integer pref to initially mute volume if 1.
+// An integer pref to initially mute volume if 1. This pref is ignored if
+// |kAudioOutputEnabled| is set to false, but its value is preserved, therefore
+// when the policy is lifted the original mute state is restored.
const char kAudioMute[] = "settings.audio.mute";
// TODO(derat): This is deprecated in favor of |kAudioVolumePercent|; remove it
@@ -1768,6 +1770,15 @@ const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
// storage for the user.
const char kExternalStorageDisabled[] = "hardware.external_storage_disabled";
+// A pref holding the value of the policy used to disable playing audio on
+// ChromeOS devices. This pref supersedes |kAudioMute| but does not overwrite
Mattias Nissler (ping if slow) 2012/08/30 11:51:26 nit: It doesn't supersede but rather override the
pastarmovj 2012/08/31 07:28:24 Done.
+// it, therefore when the policy is lifted the original mute state is restored.
+const char kAudioOutputEnabled[] = "hardware.audio_output_enabled";
+
+// A pref holding the value of the policy used to disable capturing audio on
+// ChromeOS devices.
+const char kAudioCaptureEnabled[] = "hardware.audio_capture_enabled";
+
// A dictionary that maps usernames to wallpaper properties.
const char kUsersWallpaperInfo[] = "user_wallpaper_info";
#endif

Powered by Google App Engine
This is Rietveld 408576698