chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java - Issue 2787323002: Add strict mode exception to addPreferencesFromResource calls

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/privacy/ClearBrowsingDataPreferences.java

Issue 2787323002: Add strict mode exception to addPreferencesFromResource calls (Closed)

Patch Set: rename helper to util Created 3 years, 9 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 | « chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillAndPaymentsPreferences.java ('k') | chrome/android/java_sources.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

index 666f185f26db80ba7fa32b5e0d28ad6f0b0e9402..a1f548b39121be328f3b23e32204157c428680e5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;

import org.chromium.chrome.browser.preferences.ButtonPreference;

import org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference;

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

+import org.chromium.chrome.browser.preferences.PreferenceUtils;

import org.chromium.chrome.browser.preferences.SpinnerPreference;

import org.chromium.chrome.browser.preferences.TextMessageWithLinkAndIconPreference;

import org.chromium.chrome.browser.preferences.privacy.BrowsingDataCounterBridge.BrowsingDataCounterCallback;

@@ -502,7 +503,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment

mMaxImportantSites = BrowsingDataBridge.getMaxImportantSites();

BrowsingDataBridge.getInstance().requestInfoAboutOtherFormsOfBrowsingHistory(this);

getActivity().setTitle(R.string.clear_browsing_data_title);

- addPreferencesFromResource(getPreferenceXmlId());

+ PreferenceUtils.addPreferencesFromResource(this, getPreferenceXmlId());

DialogOption[] options = getDialogOptions();

mItems = new Item[options.length];

for (int i = 0; i < options.length; i++) {