[Offline pages] Making sure visit button works on tablet

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.enhancedbookmarks;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.preference.PreferenceManager;
 import android.support.v4.widget.DrawerLayout;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ViewSwitcher;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ObserverList;
-import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
-import org.chromium.chrome.browser.ntp.NewTabPageUma;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ skipping 389 matching lines @@
     }
 
     @Override
     public DrawerLayout getDrawerLayout() {
         return mDrawer;
     }
 
     @Override
     public void openBookmark(BookmarkId bookmark, int launchLocation) {
         clearSelection();
-        if (mEnhancedBookmarksModel.getBookmarkById(bookmark) != null) {
-            String url = mEnhancedBookmarksModel.getLaunchUrlAndMarkAccessed(mActivity, bookmark);
-            // TODO(jianli): Notify the user about the failure.
-            if (TextUtils.isEmpty(url)) return;
-
-            NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_BOOKMARK);
-            if (url.startsWith("file:")) {
-                RecordHistogram.recordEnumeratedHistogram("OfflinePages.LaunchLocation",
-                        launchLocation, LaunchLocation.COUNT);
-            } else {
-                RecordHistogram.recordEnumeratedHistogram("Stars.LaunchLocation", launchLocation,
-                        LaunchLocation.COUNT);
-            }
-            EnhancedBookmarkUtils.openBookmark(mActivity, url);
+        if (EnhancedBookmarkUtils.openBookmark(
+                    mEnhancedBookmarksModel, mActivity, bookmark, launchLocation)) {
             EnhancedBookmarkUtils.finishActivityOnPhone(mActivity);
         }
     }
 
     @Override
     public void openSearchUI() {
         // Give search view focus, because it needs to handle back key event.
         mViewSwitcher.showNext();
     }
 
@@ skipping 155 matching lines @@
         }
 
         @Override
         public boolean equals(Object obj) {
             if (!(obj instanceof UIState)) return false;
             UIState other = (UIState) obj;
             return mState == other.mState && mUrl.equals(other.mUrl);
         }
     }
 }