Index: chrome/browser/android/bookmarks/bookmark_bridge.cc |
diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc |
index 7e60344284cebe072ff718067400abd1c515f684..476203d8c8a1fd1ddf850ba1c9274d4d74e50492 100644 |
--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc |
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc |
@@ -581,8 +581,8 @@ void BookmarkBridge::GetBookmarksForFolder( |
} |
if (j_callback_obj) { |
- Java_BookmarksCallback_onBookmarksAvailable( |
- env, j_callback_obj, folder_id_obj.obj(), j_result_obj); |
+ Java_BookmarksCallback_onBookmarksAvailable(env, j_callback_obj, |
+ folder_id_obj, j_result_obj); |
} |
} |
@@ -631,7 +631,7 @@ void BookmarkBridge::GetCurrentFolderHierarchy( |
} |
Java_BookmarksCallback_onBookmarksFolderHierarchyAvailable( |
- env, j_callback_obj, folder_id_obj.obj(), j_result_obj); |
+ env, j_callback_obj, folder_id_obj, j_result_obj); |
} |
void BookmarkBridge::SearchBookmarks(JNIEnv* env, |
@@ -666,10 +666,10 @@ void BookmarkBridge::SearchBookmarks(JNIEnv* env, |
Java_BookmarkBridge_addToBookmarkMatchList( |
env, j_list, node->id(), node->type(), |
- ToJavaIntArray(env, title_match_start_positions).obj(), |
- ToJavaIntArray(env, title_match_end_positions).obj(), |
- ToJavaIntArray(env, url_match_start_positions).obj(), |
- ToJavaIntArray(env, url_match_end_positions).obj()); |
+ ToJavaIntArray(env, title_match_start_positions), |
+ ToJavaIntArray(env, title_match_end_positions), |
+ ToJavaIntArray(env, url_match_start_positions), |
+ ToJavaIntArray(env, url_match_end_positions)); |
} |
} |
@@ -819,16 +819,10 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::CreateJavaBookmark( |
url = node->url().spec(); |
return Java_BookmarkBridge_createBookmarkItem( |
- env, |
- node->id(), |
- GetBookmarkType(node), |
- ConvertUTF16ToJavaString(env, GetTitle(node)).obj(), |
- ConvertUTF8ToJavaString(env, url).obj(), |
- node->is_folder(), |
- parent_id, |
- GetBookmarkType(parent), |
- IsEditable(node), |
- IsManaged(node)); |
+ env, node->id(), GetBookmarkType(node), |
+ ConvertUTF16ToJavaString(env, GetTitle(node)), |
+ ConvertUTF8ToJavaString(env, url), node->is_folder(), parent_id, |
+ GetBookmarkType(parent), IsEditable(node), IsManaged(node)); |
} |
void BookmarkBridge::ExtractBookmarkNodeInformation(const BookmarkNode* node, |
@@ -836,8 +830,7 @@ void BookmarkBridge::ExtractBookmarkNodeInformation(const BookmarkNode* node, |
JNIEnv* env = AttachCurrentThread(); |
if (!IsReachable(node)) |
return; |
- Java_BookmarkBridge_addToList( |
- env, j_result_obj, CreateJavaBookmark(node).obj()); |
+ Java_BookmarkBridge_addToList(env, j_result_obj, CreateJavaBookmark(node)); |
} |
const BookmarkNode* BookmarkBridge::GetNodeByID(long node_id, int type) { |
@@ -874,7 +867,7 @@ void BookmarkBridge::EditBookmarksEnabledChanged() { |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_editBookmarksEnabledChanged(env, obj.obj()); |
+ Java_BookmarkBridge_editBookmarksEnabledChanged(env, obj); |
} |
bool BookmarkBridge::IsEditable(const BookmarkNode* node) const { |
@@ -945,7 +938,7 @@ void BookmarkBridge::NotifyIfDoneLoading() { |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkModelLoaded(env, obj.obj()); |
+ Java_BookmarkBridge_bookmarkModelLoaded(env, obj); |
} |
// ------------- Observer-related methods ------------- // |
@@ -960,7 +953,7 @@ void BookmarkBridge::BookmarkModelChanged() { |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkModelChanged(env, obj.obj()); |
+ Java_BookmarkBridge_bookmarkModelChanged(env, obj); |
} |
void BookmarkBridge::BookmarkModelLoaded(BookmarkModel* model, |
@@ -976,7 +969,7 @@ void BookmarkBridge::BookmarkModelBeingDeleted(BookmarkModel* model) { |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkModelDeleted(env, obj.obj()); |
+ Java_BookmarkBridge_bookmarkModelDeleted(env, obj); |
} |
void BookmarkBridge::BookmarkNodeMoved(BookmarkModel* model, |
@@ -992,12 +985,8 @@ void BookmarkBridge::BookmarkNodeMoved(BookmarkModel* model, |
if (obj.is_null()) |
return; |
Java_BookmarkBridge_bookmarkNodeMoved( |
- env, |
- obj.obj(), |
- CreateJavaBookmark(old_parent).obj(), |
- old_index, |
- CreateJavaBookmark(new_parent).obj(), |
- new_index); |
+ env, obj, CreateJavaBookmark(old_parent), old_index, |
+ CreateJavaBookmark(new_parent), new_index); |
} |
void BookmarkBridge::BookmarkNodeAdded(BookmarkModel* model, |
@@ -1010,11 +999,8 @@ void BookmarkBridge::BookmarkNodeAdded(BookmarkModel* model, |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkNodeAdded( |
- env, |
- obj.obj(), |
- CreateJavaBookmark(parent).obj(), |
- index); |
+ Java_BookmarkBridge_bookmarkNodeAdded(env, obj, CreateJavaBookmark(parent), |
+ index); |
} |
void BookmarkBridge::BookmarkNodeRemoved(BookmarkModel* model, |
@@ -1029,12 +1015,8 @@ void BookmarkBridge::BookmarkNodeRemoved(BookmarkModel* model, |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkNodeRemoved( |
- env, |
- obj.obj(), |
- CreateJavaBookmark(parent).obj(), |
- old_index, |
- CreateJavaBookmark(node).obj()); |
+ Java_BookmarkBridge_bookmarkNodeRemoved(env, obj, CreateJavaBookmark(parent), |
+ old_index, CreateJavaBookmark(node)); |
} |
void BookmarkBridge::BookmarkAllUserNodesRemoved( |
@@ -1047,7 +1029,7 @@ void BookmarkBridge::BookmarkAllUserNodesRemoved( |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkAllUserNodesRemoved(env, obj.obj()); |
+ Java_BookmarkBridge_bookmarkAllUserNodesRemoved(env, obj); |
} |
void BookmarkBridge::BookmarkNodeChanged(BookmarkModel* model, |
@@ -1059,10 +1041,7 @@ void BookmarkBridge::BookmarkNodeChanged(BookmarkModel* model, |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkNodeChanged( |
- env, |
- obj.obj(), |
- CreateJavaBookmark(node).obj()); |
+ Java_BookmarkBridge_bookmarkNodeChanged(env, obj, CreateJavaBookmark(node)); |
} |
void BookmarkBridge::BookmarkNodeChildrenReordered(BookmarkModel* model, |
@@ -1074,10 +1053,8 @@ void BookmarkBridge::BookmarkNodeChildrenReordered(BookmarkModel* model, |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_bookmarkNodeChildrenReordered( |
- env, |
- obj.obj(), |
- CreateJavaBookmark(node).obj()); |
+ Java_BookmarkBridge_bookmarkNodeChildrenReordered(env, obj, |
+ CreateJavaBookmark(node)); |
} |
void BookmarkBridge::ExtensiveBookmarkChangesBeginning(BookmarkModel* model) { |
@@ -1088,7 +1065,7 @@ void BookmarkBridge::ExtensiveBookmarkChangesBeginning(BookmarkModel* model) { |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_extensiveBookmarkChangesBeginning(env, obj.obj()); |
+ Java_BookmarkBridge_extensiveBookmarkChangesBeginning(env, obj); |
} |
void BookmarkBridge::ExtensiveBookmarkChangesEnded(BookmarkModel* model) { |
@@ -1099,7 +1076,7 @@ void BookmarkBridge::ExtensiveBookmarkChangesEnded(BookmarkModel* model) { |
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
if (obj.is_null()) |
return; |
- Java_BookmarkBridge_extensiveBookmarkChangesEnded(env, obj.obj()); |
+ Java_BookmarkBridge_extensiveBookmarkChangesEnded(env, obj); |
} |
void BookmarkBridge::PartnerShimChanged(PartnerBookmarksShim* shim) { |