Initial version of the split CBD dialog

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

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 a8e4f3ce9c5c77feb162e5e204a69f4be1e7c295..55b344d2265c1ed05c56df8ac41014b28b957bbb 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
@@ -71,7 +71,12 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
             mCheckbox.setOnPreferenceClickListener(this);
             mCheckbox.setEnabled(enabled);
             mCheckbox.setChecked(selected);
-            mCheckbox.setSummaryOff("");  // No summary when unchecked.
+
+            if (!ClearBrowsingDataTabsFragment.isFeatureEnabled()) {
+                // No summary when unchecked. The redesigned basic and advanced
+                // views will always show the counter.

[Theresa, 2017/01/19 19:08:26]

Should this comment say "The redesigned basic and advanced CBD views will always
show the checkbox summary"? Or "... will always show the checkbox summary set in
{@link #onCounterFinished()"?

[dullweber, 2017/01/20 10:53:07]

Yes, the first alternative sounds better.

+                mCheckbox.setSummaryOff("");
+            }
         }
 
         public void destroy() {
@@ -100,6 +105,9 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
         @Override
         public void onCounterFinished(String result) {
             mCheckbox.setSummaryOn(result);
+            if (ClearBrowsingDataTabsFragment.isFeatureEnabled()) {
+                mCheckbox.setSummaryOff(result);
+            }
             if (mShouldAnnounceCounterResult) {
                 mCheckbox.announceForAccessibility(result);
             }
@@ -277,7 +285,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
      * Returns the Array of dialog options. Options are displayed in the same
      * order as they appear in the array.
      */
-    private DialogOption[] getDialogOptions() {
+    protected DialogOption[] getDialogOptions() {
         return new DialogOption[] {
                 DialogOption.CLEAR_HISTORY,
                 DialogOption.CLEAR_COOKIES_AND_SITE_DATA,