| 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,
|
|
|