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

Unified Diff: chrome/browser/android/preferences/website_preference_bridge.cc

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: Polish 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/browser/android/preferences/website_preference_bridge.cc
diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
index a82ee7513e878fd26f14a3488a0f5a7b5ec3a0a8..80aead0929253a1c90fed08a144aa514e3da0ff8 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -91,8 +91,11 @@ static void GetOrigins(JNIEnv* env,
jembedder = ConvertUTF8ToJavaString(env, embedder);
switch (content_type) {
case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+ Java_WebsitePreferenceBridge_insertMicrophoneCaptureInfoIntoList(
+ env, list, jorigin.obj(), jembedder.obj());
+ break;
case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
- Java_WebsitePreferenceBridge_insertVoiceAndVideoCaptureInfoIntoList(
+ Java_WebsitePreferenceBridge_insertCameraCaptureInfoIntoList(
env, list, jorigin.obj(), jembedder.obj());
break;
case CONTENT_SETTINGS_TYPE_GEOLOCATION:
@@ -285,6 +288,20 @@ static void GetVoiceAndVideoCaptureOrigins(JNIEnv* env,
GetOrigins(env, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, list, managedOnly);
}
+static void GetCameraCaptureOrigins(JNIEnv* env,
+ jclass clazz,
+ jobject list,
+ jboolean managedOnly) {
+ GetOrigins(env, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, list, managedOnly);
+}
+
+static void GetMicrophoneCaptureOrigins(JNIEnv* env,
+ jclass clazz,
+ jobject list,
+ jboolean managedOnly) {
+ GetOrigins(env, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, list, managedOnly);
+}
+
static jint GetVoiceCaptureSettingForOrigin(JNIEnv* env, jclass clazz,
jstring origin, jstring embedder) {
return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

Powered by Google App Engine
This is Rietveld 408576698