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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java

Issue 1285313003: [Offline pages] Wiring saving and opening offline page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync Created 5 years, 4 months 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
Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
index 1daeb2c8f9fa9bebc8f8b9a2b6fd4a2d52998fd4..bbf33dc5da2f400b5600d7d1b6566b178fb12c30 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkManager.java
@@ -9,6 +9,7 @@ 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;
@@ -410,11 +411,14 @@ public class EnhancedBookmarkManager implements EnhancedBookmarkDelegate {
public void openBookmark(BookmarkId bookmark, int launchLocation) {
clearSelection();
if (mEnhancedBookmarksModel.getBookmarkById(bookmark) != null) {
+ String url = mEnhancedBookmarksModel.getBookmarkLaunchUrl(bookmark);
+ // TODO(jianli): Notify the user about the failure.
+ if (TextUtils.isEmpty(url)) return;
+
NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_BOOKMARK);
RecordHistogram.recordEnumeratedHistogram("Stars.LaunchLocation", launchLocation,
LaunchLocation.COUNT);
- EnhancedBookmarkUtils.openBookmark(mActivity,
- mEnhancedBookmarksModel.getBookmarkById(bookmark).getUrl());
+ EnhancedBookmarkUtils.openBookmark(mActivity, url);
finishActivityOnPhone();
}
}

Powered by Google App Engine
This is Rietveld 408576698