Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1399)

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

Issue 1870703002: Connect the "other forms of browsing history" frontend on Android to backend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-dialog-rebased
Patch Set: Created 4 years, 8 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
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 009c32111a052ee82010f27d47236bf2242826fc..f456870ca6f2ce8408ea199253556f46ffe50be7 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
@@ -37,8 +37,9 @@ import java.util.EnumSet;
*/
public class ClearBrowsingDataPreferences extends PreferenceFragment
implements PrefServiceBridge.OnClearBrowsingDataListener,
+ PrefServiceBridge.OtherFormsOfBrowsingHistoryListener,
Preference.OnPreferenceClickListener,
- Preference.OnPreferenceChangeListener{
+ Preference.OnPreferenceChangeListener {
/**
* Represents a single item in the dialog.
*/
@@ -338,6 +339,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ PrefServiceBridge.getInstance().requestInfoAboutOtherFormsOfBrowsingHistory(this);
getActivity().setTitle(R.string.clear_browsing_data_title);
addPreferencesFromResource(R.xml.clear_browsing_data_preferences);
DialogOption[] options = getDialogOptions();
@@ -463,8 +465,10 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
* Shows a notice about other forms of browsing history. To be called by the web history
* service when it discovers that they exist.
gone 2016/04/07 22:27:55 nits: 1) Called by the web history etc etc 2) This
msramek 2016/04/08 16:03:18 Done.
*/
- @VisibleForTesting
+ @Override
public void showNoticeAboutOtherFormsOfBrowsingHistory() {
+ if (getActivity() == null) return;
+
TextMessageWithLinkAndIconPreference google_summary =
(TextMessageWithLinkAndIconPreference) findPreference(PREF_GOOGLE_SUMMARY);
if (google_summary == null) return;
@@ -477,8 +481,10 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
* after deleting their Chrome history. To be called by the web history service when the
gone 2016/04/07 22:27:55 Ditto.
msramek 2016/04/08 16:03:18 Done.
* conditions for showing the dialog are met.
*/
- @VisibleForTesting
+ @Override
public void enableDialogAboutOtherFormsOfBrowsingHistory() {
+ if (getActivity() == null) return;
+
mDialogAboutOtherFormsOfBrowsingHistoryEnabled = true;
}

Powered by Google App Engine
This is Rietveld 408576698