[Offline pages] Making sure visit button works on tablet

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.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.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ skipping 12 matching lines @@
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.DeletePageCallback;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallback;
 import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.chrome.browser.widget.EmptyAlertEditText;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.ui.base.DeviceFormFactor;
 
 /**
  * The activity that enables the user to modify the title, url and parent folder of a bookmark.
  */
 public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
     /** The intent extra specifying the ID of the bookmark to be edited. */
     public static final String INTENT_BOOKMARK_ID = "EnhancedBookmarkEditActivity.BookmarkId";
     public static final String INTENT_WEB_CONTENTS = "EnhancedBookmarkEditActivity.WebContents";
 
     private static final String TAG = "cr.BookmarkEdit";
@@ skipping 261 matching lines @@
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 recordOfflineButtonAction(true);
                 openBookmark();
             }
         });
     }
 
     private void openBookmark() {
-        Intent intent = new Intent();
-        intent.putExtra(EnhancedBookmarkActivity.INTENT_VISIT_BOOKMARK_ID, mBookmarkId.toString());
-        setResult(RESULT_OK, intent);
+        // TODO(kkimlabs): Refactor this out to handle the intent in ChromeActivity.
+        if (DeviceFormFactor.isTablet(this)) {
+            EnhancedBookmarkUtils.openBookmark(
+                    mEnhancedBookmarksModel, this, mBookmarkId, LaunchLocation.BOOKMARK_EDITOR);
+        } else {
+            Intent intent = new Intent();
+            intent.putExtra(
+                    EnhancedBookmarkActivity.INTENT_VISIT_BOOKMARK_ID, mBookmarkId.toString());
+            setResult(RESULT_OK, intent);
+        }
         finish();
     }
 
     private void recordOfflineButtonAction(boolean clicked) {
         // If button type is not set, it means that either offline section is not shown or we have
         // already recorded the click action.
         if (mOfflineButtonType == OfflineButtonType.NONE) {
             return;
         }
 
@@ skipping 15 matching lines @@
             } else if (mOfflineButtonType == OfflineButtonType.REMOVE) {
                 RecordUserAction.record("OfflinePages.Edit.RemoveButtonNotClicked");
             } else if (mOfflineButtonType == OfflineButtonType.VISIT) {
                 RecordUserAction.record("OfflinePages.Edit.VisitButtonNotClicked");
             }
         }
 
         mOfflineButtonType = OfflineButtonType.NONE;
     }
 }