chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java - Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@only_register_platform_used_contentsettingtypes

Patch Set: nit change in comments Created 4 years, 6 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/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 0f273251fcc1b5eef8babcc710f8911293d52c67..341941c46ff9e3f251bc504438013fa5d930fd18 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

@@ -157,13 +157,6 @@ public final class PrefServiceBridge {

if (currentVersion < 1) {

nativeMigrateJavascriptPreference();

}

- // Steps 2,3 intentionally skipped.

Bernhard Bauer 2016/06/09 08:55:45 Keep this comment and include step 4?

- 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).apply();

}

« no previous file with comments | « no previous file | chrome/browser/android/preferences/pref_service_bridge.cc » ('j') | no next file with comments »