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..20b8f717a0f7a26bbf5c0d8c954c5d5a80d8443f 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,9 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
             mCheckbox.setOnPreferenceClickListener(this);
             mCheckbox.setEnabled(enabled);
             mCheckbox.setChecked(selected);
-            mCheckbox.setSummaryOff("");  // No summary when unchecked.
+            if (!ClearBrowsingDataTabsFragment.isFeatureEnabled()) {
+                mCheckbox.setSummaryOff(""); // No summary when unchecked.

[msramek, 2017/01/18 17:06:39]

nit: Two spaces before an inline comment. Even better, expand the comment to
explain that our redesign uses always-shown summaries.

[dullweber, 2017/01/19 13:16:14]

Done.
git cl format removes the additional space but the style guide is also using at
least two spaces (http://source.android.com/source/code-style.html). Should this
be reported as a bug?

+            }
         }
 
         public void destroy() {
@@ -100,6 +102,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 +282,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,