| 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 3048fb5ab177f321dba8d185932bc3276d555bbb..73c50666bdd6f4459d3d4cc9f76f1c4a80b5dd6c 100644
|
| --- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
|
| +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/bookmarks/bookmark_model.h"
|
| #include "chrome/browser/bookmarks/bookmark_model_factory.h"
|
| +#include "chrome/browser/bookmarks/bookmark_utils.h"
|
| #include "chrome/browser/profiles/incognito_helpers.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_android.h"
|
| @@ -233,20 +234,16 @@ ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark(
|
| IsEditable(node));
|
| }
|
|
|
| -void BookmarksBridge::ExtractBookmarkNodeInformation(
|
| - const BookmarkNode* node,
|
| - jobject j_result_obj) {
|
| +void BookmarksBridge::ExtractBookmarkNodeInformation(const BookmarkNode* node,
|
| + jobject j_result_obj) {
|
| JNIEnv* env = AttachCurrentThread();
|
| if (!IsReachable(node))
|
| return;
|
| Java_BookmarksBridge_addToList(
|
| - env,
|
| - j_result_obj,
|
| - CreateJavaBookmark(node).obj());
|
| + env, j_result_obj, CreateJavaBookmark(node).obj());
|
| }
|
|
|
| -const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id,
|
| - int type) {
|
| +const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id, int type) {
|
| const BookmarkNode* node;
|
| if (type == kBookmarkTypeManaged) {
|
| node = managed_bookmarks_shim_->GetNodeByID(
|
| @@ -255,13 +252,13 @@ const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id,
|
| node = partner_bookmarks_shim_->GetNodeByID(
|
| static_cast<int64>(node_id));
|
| } else {
|
| - node = bookmark_model_->GetNodeByID(static_cast<int64>(node_id));
|
| + node = GetBookmarkNodeByID(bookmark_model_, static_cast<int64>(node_id));
|
| }
|
| return node;
|
| }
|
|
|
| -const BookmarkNode* BookmarksBridge::GetFolderWithFallback(
|
| - long folder_id, int type) {
|
| +const BookmarkNode* BookmarksBridge::GetFolderWithFallback(long folder_id,
|
| + int type) {
|
| const BookmarkNode* folder = GetNodeByID(folder_id, type);
|
| if (!folder || folder->type() == BookmarkNode::URL ||
|
| !IsFolderAvailable(folder)) {
|
|
|