Index: chrome/common/pref_names.cc |
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc |
index 92d8296ed239e61250c8e66c626de55bf9c73d62..c950a78b4e87d4fb09b732dc619631365bc335a9 100644 |
--- a/chrome/common/pref_names.cc |
+++ b/chrome/common/pref_names.cc |
@@ -2025,15 +2025,23 @@ const char kDailyHttpReceivedContentLength[] = |
// date of the last update to |kDailyHttp{Original,Received}ContentLength|. |
const char kDailyHttpContentLengthLastUpdateDate[] = |
"data_reduction.last_update_date"; |
-#endif |
+#endif // defined(OS_ANDROID) || defined(OS_IOS) |
-// A pref holding the value of the policy used to disable capturing audio on |
-// ChromeOS devices. |
+// A pref holding the value of the policy used to explicitly allow or deny |
+// access to audio capture devices. When enabled, this works in conjunction |
+// with the kAudioCaptureAllowedUrls policy list. |
Mattias Nissler (ping if slow)
2013/05/28 08:11:39
Is that true? Looking at the code kAudioCaptureAll
tommi (sloooow) - chröme
2013/05/28 10:19:43
Thanks for catching. This was true a few patch se
|
const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; |
+// Holds the whitelisted URL patterns that we refer to when kAudioCaptureAllowed |
+// is enabled. |
+const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; |
-// A pref holding the value of the policy used to disable capturing audio on |
-// ChromeOS devices. |
+// A pref holding the value of the policy used to explicitly allow or deny |
+// access to video capture devices. When enabled, this works in conjunction |
+// with the kVideoCaptureAllowedUrls policy list. |
const char kVideoCaptureAllowed[] = "hardware.video_capture_enabled"; |
+// Holds the whitelisted URL patterns that we refer to when kVideoCaptureAllowed |
+// is enabled. |
+const char kVideoCaptureAllowedUrls[] = "hardware.video_capture_allowed_urls"; |
#if defined(OS_CHROMEOS) |
// Dictionary for transient storage of settings that should go into device |