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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

Issue 1084423002: Split Camera and Mic into two permissions on the Site Details page (under Site Settings). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 5 years, 8 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/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
index d336d844287be3e034ac059142069e5c25009808..401b04ec24cb2fa3876748d90def079b2c5a644b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
@@ -721,32 +721,61 @@ public final class PrefServiceBridge {
}
/**
- * @return Whether the camera/microphone permission is enabled.
+ * @return Whether the camera permission is enabled.
*/
- public boolean isCameraMicEnabled() {
- return nativeGetCameraMicEnabled();
+ public boolean isCameraEnabled() {
+ return nativeGetCameraEnabled();
}
/**
- * Sets the preferences on whether to enable/disable camera and microphone
+ * Sets the preferences on whether to enable/disable camera.
*/
- public void setCameraMicEnabled(boolean enabled) {
- nativeSetCameraMicEnabled(enabled);
+ public void setCameraEnabled(boolean enabled) {
+ nativeSetCameraEnabled(enabled);
}
/**
* @return Whether the camera/microphone permission is managed
* by the custodian of the supervised account.
*/
- public boolean isCameraMicManagedByCustodian() {
- return nativeGetCameraMicManagedByCustodian();
+ public boolean isCameraManagedByCustodian() {
+ return nativeGetCameraManagedByCustodian();
}
/**
- * @return Whether the camera/microphone permission is editable by the user.
+ * @return Whether the camera permission is editable by the user.
*/
- public boolean isCameraMicUserModifiable() {
- return nativeGetCameraMicUserModifiable();
+ public boolean isCameraUserModifiable() {
+ return nativeGetCameraUserModifiable();
+ }
+
+ /**
+ * @return Whether the microphone permission is enabled.
+ */
+ public boolean isMicEnabled() {
+ return nativeGetMicEnabled();
+ }
+
+ /**
+ * Sets the preferences on whether to enable/disable microphone.
+ */
+ public void setMicEnabled(boolean enabled) {
+ nativeSetMicEnabled(enabled);
+ }
+
+ /**
+ * @return Whether the microphone permission is managed by the custodian of
+ * the supervised account.
+ */
+ public boolean isMicManagedByCustodian() {
+ return nativeGetMicManagedByCustodian();
+ }
+
+ /**
+ * @return Whether the microphone permission is editable by the user.
+ */
+ public boolean isMicUserModifiable() {
+ return nativeGetMicUserModifiable();
}
/**
@@ -877,8 +906,14 @@ public final class PrefServiceBridge {
private native boolean nativeGetDoNotTrackEnabled();
private native boolean nativeGetPasswordEchoEnabled();
private native boolean nativeGetFirstRunEulaAccepted();
- private native boolean nativeGetCameraMicUserModifiable();
- private native boolean nativeGetCameraMicManagedByCustodian();
+ private native boolean nativeGetCameraEnabled();
+ private native void nativeSetCameraEnabled(boolean allow);
+ private native boolean nativeGetCameraUserModifiable();
+ private native boolean nativeGetCameraManagedByCustodian();
+ private native boolean nativeGetMicEnabled();
+ private native void nativeSetMicEnabled(boolean allow);
+ private native boolean nativeGetMicUserModifiable();
+ private native boolean nativeGetMicManagedByCustodian();
private native boolean nativeGetFullscreenAllowed();
private native boolean nativeGetFullscreenManaged();
private native boolean nativeGetTranslateEnabled();
@@ -911,11 +946,9 @@ public final class PrefServiceBridge {
private native boolean nativeGetAllowLocationEnabled();
private native boolean nativeGetPushNotificationsEnabled();
private native void nativeSetAllowLocationEnabled(boolean allow);
- private native void nativeSetCameraMicEnabled(boolean allow);
private native void nativeSetPushNotificationsEnabled(boolean allow);
private native void nativeSetPasswordEchoEnabled(boolean enabled);
private native void nativeSetPopupException(String pattern, int setting);
- private native boolean nativeGetCameraMicEnabled();
private native boolean nativeGetAutologinEnabled();
private native void nativeSetAutologinEnabled(boolean autologinEnabled);
private native void nativeSetCrashReporting(boolean reporting);

Powered by Google App Engine
This is Rietveld 408576698