From ea5874e7b141987bbc5995d0b72634c1296a2459 Mon Sep 17 00:00:00 2001 From: finnur Date: Wed, 12 Nov 2014 18:27:58 -0800 Subject: [PATCH] Adding functions to check status of camera permission. This is what my test CL depends on. BUG=425698 Review URL: https://codereview.chromium.org/723723002 Cr-Commit-Position: refs/heads/master@{#303963} --- .../chromium/chrome/browser/preferences/PrefServiceBridge.java | 8 ++++++++ chrome/browser/android/preferences/pref_service_bridge.cc | 7 +++++++ 2 files changed, 15 insertions(+) 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 4a052357072f..786031c93d3c 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 @@ -550,6 +550,13 @@ public final class PrefServiceBridge { } /** + * @return Whether the camera/microphone permission is enabled. + */ + public boolean isCameraMicEnabled() { + return nativeGetCameraMicEnabled(); + } + + /** * @return true if incognito mode is enabled. */ public boolean isIncognitoModeEnabled() { @@ -718,6 +725,7 @@ public final class PrefServiceBridge { private native void nativeSetPopupException(String pattern, boolean allow); private native void nativeRemovePopupException(String pattern); private native void nativeGetPopupExceptions(Object list); + private native boolean nativeGetCameraMicEnabled(); private native boolean nativeGetAutologinEnabled(); private native void nativeSetAutologinEnabled(boolean autologinEnabled); private native void nativeSetCrashReporting(boolean reporting); diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc index e6868b7aefe3..78068fe80ee3 100644 --- a/chrome/browser/android/preferences/pref_service_bridge.cc +++ b/chrome/browser/android/preferences/pref_service_bridge.cc @@ -478,6 +478,13 @@ static void SetAllowPopupsEnabled(JNIEnv* env, jobject obj, jboolean allow) { allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK); } +static jboolean GetCameraMicEnabled(JNIEnv* env, jobject obj) { + HostContentSettingsMap* content_settings = + GetOriginalProfile()->GetHostContentSettingsMap(); + return GetBooleanForContentSetting(content_settings, + CONTENT_SETTINGS_TYPE_MEDIASTREAM); +} + static jboolean GetAutologinEnabled(JNIEnv* env, jobject obj) { return GetPrefService()->GetBoolean(prefs::kAutologinEnabled); } -- 2.11.4.GIT