Chromium Code Reviews| 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 f5429b1581ad863d1a0e0c5ab35cf72e94b59d56..0289e909bcffa94e301ec293eb3872a046426436 100644 |
| --- a/chrome/browser/android/preferences/website_preference_bridge.cc |
| +++ b/chrome/browser/android/preferences/website_preference_bridge.cc |
| @@ -111,6 +111,9 @@ static void GetOrigins(JNIEnv* env, |
| Java_WebsitePreferenceBridge_insertPushNotificationIntoList( |
| env, list, jorigin.obj(), jembedder.obj()); |
| break; |
| + case CONTENT_SETTINGS_TYPE_FULLSCREEN: |
| + Java_WebsitePreferenceBridge_insertFullscreenInfoIntoList( |
| + env, list, jorigin.obj(), jembedder.obj()); |
| default: |
| DCHECK(false); |
| break; |
| @@ -144,6 +147,7 @@ static void SetSettingForOrigin(JNIEnv* env, |
| case 0: setting = CONTENT_SETTING_DEFAULT; break; |
| case 1: setting = CONTENT_SETTING_ALLOW; break; |
| case 2: setting = CONTENT_SETTING_BLOCK; break; |
| + case 3: setting = CONTENT_SETTING_ASK; break; |
| default: |
| NOTREACHED(); |
| } |
| @@ -156,6 +160,26 @@ static void SetSettingForOrigin(JNIEnv* env, |
| WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting); |
| } |
| +static void GetFullscreenOrigins(JNIEnv* env, |
| + jclass clazz, |
|
Finnur
2015/03/19 10:35:26
nit: indentation seems off.
qinmin
2015/03/19 18:15:00
Done.
|
| + jobject list, |
| + jboolean managedOnly) { |
| + GetOrigins(env, CONTENT_SETTINGS_TYPE_FULLSCREEN, list, managedOnly); |
| +} |
| + |
| +static jint GetFullscreenSettingForOrigin(JNIEnv* env, jclass clazz, |
| + jstring origin, jstring embedder) { |
| + return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_FULLSCREEN, |
| + origin, embedder); |
| +} |
| + |
| +static void SetFullscreenSettingForOrigin(JNIEnv* env, jclass clazz, |
| + jstring origin, jstring embedder, jint value) { |
| + GURL embedder_url(ConvertJavaStringToUTF8(env, embedder)); |
| + SetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_FULLSCREEN, |
| + origin, ContentSettingsPattern::FromURLNoWildcard(embedder_url), value); |
| +} |
| + |
| static void GetGeolocationOrigins(JNIEnv* env, |
| jclass clazz, |
| jobject list, |