chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java - Issue 2644573003: Initial version of the split CBD dialog

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

Issue 2644573003: Initial version of the split CBD dialog (Closed)

Patch Set: title case for tab titles Created 3 years, 11 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

« chrome/android/java/res/layout/clear_browsing_data_tabs.xml ('K') | « chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

index 52394aa19cdfb977602ea42899889d5a9e293533..5d63cf88bf99559bd74ff1570a65d9423499395e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;

import org.chromium.chrome.browser.favicon.LargeIconBridge;

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

import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferences;

+import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment;

import org.chromium.chrome.browser.profiles.Profile;

import org.chromium.chrome.browser.signin.SigninManager;

import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;

@@ -252,8 +253,10 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser

public void openClearBrowsingDataPreference() {

recordUserAction("ClearBrowsingData");

- Intent intent = PreferencesLauncher.createIntentForSettingsPage(mActivity,

- ClearBrowsingDataPreferences.class.getName());

+ String fragmentName = ClearBrowsingDataTabsFragment.isFeatureEnabled()

+ ? ClearBrowsingDataTabsFragment.class.getName()

+ : ClearBrowsingDataPreferences.class.getName();

Theresa 2017/01/19 19:08:26 Does it make sense to to pull this into a helper m

dullweber 2017/01/20 10:53:07 Sounds good. I created a helper in the PreferenceL

+ Intent intent = PreferencesLauncher.createIntentForSettingsPage(mActivity, fragmentName);

IntentUtils.safeStartActivity(mActivity, intent);

}