| Index: chrome/android/java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java
|
| index d2e9ce9471fe074f68b423365a3999e49bd04853..c4c5a0789b52b807359140aae9c4785f68c8d723 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java
|
| @@ -41,7 +41,7 @@ public class BrowsingHistoryBridge implements HistoryProvider {
|
|
|
| @Override
|
| public void markItemForRemoval(HistoryItem item) {
|
| - nativeMarkItemForRemoval(mNativeHistoryBridge, item.getUrl(), item.getTimestamps());
|
| + nativeMarkItemForRemoval(mNativeHistoryBridge, item.getUrl(), item.getNativeTimestamps());
|
| }
|
|
|
| @Override
|
| @@ -58,10 +58,11 @@ public class BrowsingHistoryBridge implements HistoryProvider {
|
| }
|
|
|
| @CalledByNative
|
| - public static void createHistoryItemAndAddToList(
|
| - List<HistoryItem> items, String url, String domain, String title, long[] timestamps,
|
| + public static void createHistoryItemAndAddToList(List<HistoryItem> items, String url,
|
| + String domain, String title, long mostRecentJavaTimestamp, long[] nativeTimestamps,
|
| boolean blockedVisit) {
|
| - items.add(new HistoryItem(url, domain, title, timestamps, blockedVisit));
|
| + items.add(new HistoryItem(
|
| + url, domain, title, mostRecentJavaTimestamp, nativeTimestamps, blockedVisit));
|
| }
|
|
|
| @CalledByNative
|
| @@ -98,7 +99,7 @@ public class BrowsingHistoryBridge implements HistoryProvider {
|
| private native void nativeDestroy(long nativeBrowsingHistoryBridge);
|
| private native void nativeQueryHistory(long nativeBrowsingHistoryBridge,
|
| List<HistoryItem> historyItems, String query, long queryEndTime);
|
| - private native void nativeMarkItemForRemoval(long nativeBrowsingHistoryBridge,
|
| - String url, long[] timestamps);
|
| + private native void nativeMarkItemForRemoval(
|
| + long nativeBrowsingHistoryBridge, String url, long[] nativeTimestamps);
|
| private native void nativeRemoveItems(long nativeBrowsingHistoryBridge);
|
| }
|
|
|