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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

Issue 1240153002: Re-enable Images permission for all sites. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bauerb's comments Created 5 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
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 677a16c6a167ba031ebada149ec0062103a864a0..ff157327bc7d8f1cd20aa253c03ed0a66c251369 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
@@ -42,7 +42,7 @@ public final class PrefServiceBridge {
public static final int SUPERVISED_USER_FILTERING_BLOCK = 2;
private static final String MIGRATION_PREF_KEY = "PrefMigrationVersion";
- private static final int MIGRATION_CURRENT_VERSION = 3;
+ private static final int MIGRATION_CURRENT_VERSION = 4;
private static final String HTTPS_SCHEME = "https";
@@ -128,6 +128,12 @@ public final class PrefServiceBridge {
nativeMigrateLocationPreference();
nativeMigrateProtectedMediaPreference();
}
+ if (currentVersion < 4) {
+ // For a brief period (M44 Beta), it was possible for users to disable images via Site
+ // Settings. Now that this option has been removed, ensure that users are not stuck with
+ // images disabled.
+ setContentSettingEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES, true);
+ }
preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).commit();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698