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 f86b56fc735efec6a3a204c4b398e6961df7981a..69ccdf51b99f40749adca7ea003d69ae04618a32 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 |
@@ -19,6 +19,7 @@ import org.chromium.base.metrics.RecordUserAction; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.ChromeFeatureList; |
import org.chromium.chrome.browser.browsing_data.BrowsingDataType; |
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab; |
import org.chromium.chrome.browser.browsing_data.TimePeriod; |
import org.chromium.chrome.browser.help.HelpAndFeedback; |
import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; |
@@ -66,7 +67,8 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
mParent = parent; |
mOption = option; |
mCheckbox = checkbox; |
- mCounter = new BrowsingDataCounterBridge(this, mOption.getDataType()); |
+ mCounter = new BrowsingDataCounterBridge( |
+ this, mOption.getDataType(), mParent.getPreferenceType()); |
mCheckbox.setOnPreferenceClickListener(this); |
mCheckbox.setEnabled(enabled); |
@@ -98,7 +100,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
mParent.updateButtonState(); |
mShouldAnnounceCounterResult = true; |
PrefServiceBridge.getInstance().setBrowsingDataDeletionPreference( |
- mOption.getDataType(), mCheckbox.isChecked()); |
+ mOption.getDataType(), mParent.getPreferenceType(), mCheckbox.isChecked()); |
return true; |
} |
@@ -299,6 +301,14 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
} |
/** |
+ * Returns whether this preference page is a basic or advanced tab in order to use separate |
+ * preferences. |
+ */ |
+ protected int getPreferenceType() { |
+ return ClearBrowsingDataTab.ADVANCED; |
+ } |
+ |
+ /** |
* Returns the Array of time periods. Options are displayed in the same order as they appear |
* in the array. |
*/ |
@@ -328,7 +338,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
*/ |
private boolean isOptionSelectedByDefault(DialogOption option) { |
return PrefServiceBridge.getInstance().getBrowsingDataDeletionPreference( |
- option.getDataType()); |
+ option.getDataType(), getPreferenceType()); |
} |
/** |
@@ -416,7 +426,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
} |
PrefServiceBridge.getInstance().setBrowsingDataDeletionTimePeriod( |
- ((TimePeriodSpinnerOption) value).getTimePeriod()); |
+ getPreferenceType(), ((TimePeriodSpinnerOption) value).getTimePeriod()); |
return true; |
} |
return false; |
@@ -457,7 +467,11 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
&& !PrefServiceBridge.getInstance().canDeleteBrowsingHistory()) { |
enabled = false; |
PrefServiceBridge.getInstance().setBrowsingDataDeletionPreference( |
- DialogOption.CLEAR_HISTORY.getDataType(), false); |
+ DialogOption.CLEAR_HISTORY.getDataType(), ClearBrowsingDataTab.BASIC, |
+ false); |
+ PrefServiceBridge.getInstance().setBrowsingDataDeletionPreference( |
+ DialogOption.CLEAR_HISTORY.getDataType(), ClearBrowsingDataTab.ADVANCED, |
+ false); |
} |
mItems[i] = new Item( |
@@ -480,8 +494,8 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment |
SpinnerPreference spinner = (SpinnerPreference) findPreference(PREF_TIME_RANGE); |
spinner.setOnPreferenceChangeListener(this); |
TimePeriodSpinnerOption[] spinnerOptions = getTimePeriodSpinnerOptions(); |
- int selectedTimePeriod = |
- PrefServiceBridge.getInstance().getBrowsingDataDeletionTimePeriod(); |
+ int selectedTimePeriod = PrefServiceBridge.getInstance().getBrowsingDataDeletionTimePeriod( |
+ getPreferenceType()); |
int spinnerOptionIndex = -1; |
for (int i = 0; i < spinnerOptions.length; ++i) { |
if (spinnerOptions[i].getTimePeriod() == selectedTimePeriod) { |