chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java - Issue 2888313003: Update strings for history description in CBD

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/ClearBrowsingDataPreferencesBasic.java

Issue 2888313003: Update strings for history description in CBD (Closed)

Patch Set: add active datatype Created 3 years, 7 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/history/HistoryAdapter.java ('k') | chrome/android/java/strings/android_chrome_strings.grd » ('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/ClearBrowsingDataPreferencesBasic.java

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

index 69e2a1f21bd9c7e9cc613761a2a685e659a857ed..657f19a1dc211dc669c242f4bc5f4897a0774df5 100644

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

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

@@ -43,7 +43,7 @@ public class ClearBrowsingDataPreferencesBasic extends ClearBrowsingDataPreferen

});

if (ChromeSigninController.get().isSignedIn()) {

- if (isHistorySyncEnabled()) { // is synced

+ if (isHistorySyncEnabled()) {

historyCheckbox.setSummary(R.string.clear_browsing_history_summary_synced);

} else {

historyCheckbox.setSummary(R.string.clear_browsing_history_summary_signed_in);

@@ -57,7 +57,7 @@ public class ClearBrowsingDataPreferencesBasic extends ClearBrowsingDataPreferen

boolean syncEnabled = AndroidSyncSettings.isSyncEnabled(getActivity());

ProfileSyncService syncService = ProfileSyncService.get();

return syncEnabled && syncService != null

- && syncService.getPreferredDataTypes().contains(ModelType.TYPED_URLS);

+ && syncService.getActiveDataTypes().contains(ModelType.HISTORY_DELETE_DIRECTIVES);

}

@Override