Update access info when an offline page is being visited

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java
index 3f258249d716a1bfca0f19141ccbb319b454ded5..653ba7a5fb11aba0a62c2786b3d1a2034cce6a5a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java
@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.enhancedbookmarks;
 
+import android.util.Pair;
+
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.BookmarksBridge;
@@ -226,19 +228,21 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
     }
 
     /**
-     * Returns the url used to launch a bookmark.
+     * Retrieves the url used to launch a bookmark.
      *
      * @param bookmarkId ID of the bookmark to launch.
+     * @return the set of the launch URL and the flag indicating if it is for offline page.
      */
-    public String getBookmarkLaunchUrl(BookmarkId bookmarkId) {
+    public Pair<String, Boolean> getBookmarkLaunchUrl(BookmarkId bookmarkId) {

[newt (away), 2015/09/23 21:52:56]

Hmm. Using Pair<> makes the API complicated and hard to understand at the call
site. How about just having one method like before but renaming it to
getLaunchUrlAndMarkAccessed().

[jianli, 2015/09/23 23:21:07]

Ok. Previously I think we might have getLaunchUrl being called for some other
cases. Renamed to getLaunchUrlAndMarkAccessed. If we do have other case, I will
make change then.

         String url = getBookmarkById(bookmarkId).getUrl();
-        if (mOfflinePageBridge == null) {
-            return url;
+        if (mOfflinePageBridge != null) {
+            // Return the offline url for the offline page.
+            OfflinePageItem page = mOfflinePageBridge.getPageByBookmarkId(bookmarkId);
+            if (page != null) {
+                return Pair.create(page.getOfflineUrl(), true);
+            }
         }
-
-        // Return the offline url for the offline page.
-        OfflinePageItem page = mOfflinePageBridge.getPageByBookmarkId(bookmarkId);
-        return page == null ? url : page.getOfflineUrl();
+        return Pair.create(url, false);
     }
 
     /**
@@ -271,4 +275,15 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
     public OfflinePageBridge getOfflinePageBridge() {
         return mOfflinePageBridge;
     }
+
+    /**
+     * Mark that the offline page has been accessed, that will cause last access time and access
+     * count being updated.
+     *
+     * * @param bookmarkId Bookmark ID for the offline page.

[newt (away), 2015/09/23 21:52:56]

remove "* "

[jianli, 2015/09/23 23:21:07]

Removed since it is not longed needed.

+     */
+    public void markOfflinePageAccessed(BookmarkId bookmarkId) {
+        assert mOfflinePageBridge != null;
+        mOfflinePageBridge.markPageAccessed(bookmarkId);
+    }
 }