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

Unified Diff: chrome/browser/android/history/browsing_history_bridge.cc

Issue 2562123003: [Android History] Add clear browsing data button and privacy disclaimers (Closed)
Patch Set: [Android History] Add clear browsing data button and privacy disclaimers Created 4 years 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/strings/android_chrome_strings.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/history/browsing_history_bridge.cc
diff --git a/chrome/browser/android/history/browsing_history_bridge.cc b/chrome/browser/android/history/browsing_history_bridge.cc
index 9db2b176950bf17847c46b765a8efcc30bf531b5..220fe9f2ae5717ab1f23de81e01c5febdc931c15 100644
--- a/chrome/browser/android/history/browsing_history_bridge.cc
+++ b/chrome/browser/android/history/browsing_history_bridge.cc
@@ -43,7 +43,11 @@ void BrowsingHistoryBridge::QueryHistory(
history::QueryOptions options;
options.max_count = kMaxQueryCount;
- options.end_time = base::Time::FromJavaTime(j_query_end_time);
+ if (j_query_end_time == 0) {
+ options.end_time = base::Time();
+ } else {
+ options.end_time = base::Time::FromJavaTime(j_query_end_time);
+ }
options.duplicate_policy = history::QueryOptions::REMOVE_DUPLICATES_PER_DAY;
browsing_history_service_->QueryHistory(
@@ -138,7 +142,9 @@ void BrowsingHistoryBridge::HistoryDeleted() {
void BrowsingHistoryBridge::HasOtherFormsOfBrowsingHistory(
bool has_other_forms, bool has_synced_results) {
- // TODO(twellington): implement
+ JNIEnv* env = base::android::AttachCurrentThread();
+ Java_BrowsingHistoryBridge_hasOtherFormsOfBrowsingData(
+ env, j_history_service_obj_.obj(), has_other_forms, has_synced_results);
}
bool RegisterBrowsingHistoryBridge(JNIEnv* env) {
« no previous file with comments | « chrome/android/java/strings/android_chrome_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698