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

Unified Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 61873005: Fix a small bug in bookmarks_bridge.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 years, 1 month 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
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/bookmarks/bookmarks_bridge.cc
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 6ec80cb35e8c4a07204d76b7924b6d0c2b5bff9e..30ae8fb2e700c40bf88fb07fa88cbd5bec475d08 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -102,6 +102,12 @@ void BookmarksBridge::GetBookmarksForFolder(JNIEnv* env,
if (!folder->is_folder() || !IsReachable(folder))
return;
+ // Recreate the java bookmarkId object due to fallback.
+ ScopedJavaLocalRef<jobject> folder_id_obj =
+ Java_BookmarksBridge_createBookmarkId(
+ env, folder->id(), GetBookmarkType(folder));
+ j_folder_id_obj = folder_id_obj.obj();
+
// If this is the Mobile bookmarks folder then add the "Managed bookmarks"
// folder first, so that it's the first entry.
if (folder == bookmark_model_->mobile_node() &&
@@ -140,6 +146,12 @@ void BookmarksBridge::GetCurrentFolderHierarchy(JNIEnv* env,
if (!folder->is_folder() || !IsReachable(folder))
return;
+ // Recreate the java bookmarkId object due to fallback.
+ ScopedJavaLocalRef<jobject> folder_id_obj =
+ Java_BookmarksBridge_createBookmarkId(
+ env, folder->id(), GetBookmarkType(folder));
+ j_folder_id_obj = folder_id_obj.obj();
+
// Get the folder heirarchy
const BookmarkNode* node = folder;
while (node) {
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698