Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java |
index 5e2e3bf1c350e8fff6157922f3883f3f177b12cb..bcc1cf6b038b34195a9e63e4b27e109f71a0b974 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java |
@@ -212,6 +212,8 @@ public class WebsitePreferences extends PreferenceFragment |
return website.site().getPopupPermission() == ContentSetting.BLOCK; |
} else if (mFilter.showPushNotificationsSites(mCategoryFilter)) { |
return website.site().getPushNotificationPermission() == ContentSetting.BLOCK; |
+ } else if (mFilter.showFullscreenSites(mCategoryFilter)) { |
Finnur
2015/03/13 10:42:14
This list is also in alphabetical order (see show*
qinmin
2015/03/17 23:49:30
Done.
|
+ return website.site().getFullscreenPermission() == ContentSetting.ASK; |
} |
return false; |
@@ -362,6 +364,8 @@ public class WebsitePreferences extends PreferenceFragment |
PrefServiceBridge.getInstance().setAllowPopupsEnabled((boolean) newValue); |
} else if (mFilter.showPushNotificationsSites(mCategoryFilter)) { |
PrefServiceBridge.getInstance().setPushNotificationsEnabled((boolean) newValue); |
+ } else if (mFilter.showFullscreenSites(mCategoryFilter)) { |
Finnur
2015/03/13 10:42:14
Same here. Move to line 354.
qinmin
2015/03/17 23:49:30
Done.
|
+ PrefServiceBridge.getInstance().setFullscreenAllowed((boolean) newValue); |
} |
ChromeSwitchPreference globalToggle = (ChromeSwitchPreference) |
@@ -529,6 +533,9 @@ public class WebsitePreferences extends PreferenceFragment |
} else if (mFilter.showCookiesSites(mCategoryFilter)) { |
globalToggle.setChecked( |
PrefServiceBridge.getInstance().isAcceptCookiesEnabled()); |
+ } else if (mFilter.showFullscreenSites(mCategoryFilter)) { |
+ globalToggle.setChecked( |
+ PrefServiceBridge.getInstance().isFullscreenAllowed()); |
} |
} |
} |