Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" | 5 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "base/containers/stack_container.h" | 8 #include "base/containers/stack_container.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 it = permanent_nodes->begin(); | 137 it = permanent_nodes->begin(); |
| 138 it != permanent_nodes->end(); | 138 it != permanent_nodes->end(); |
| 139 ++it) { | 139 ++it) { |
| 140 if (*it != NULL) { | 140 if (*it != NULL) { |
| 141 Java_BookmarksBridge_addToBookmarkIdList( | 141 Java_BookmarksBridge_addToBookmarkIdList( |
| 142 env, j_result_obj, (*it)->id(), GetBookmarkType(*it)); | 142 env, j_result_obj, (*it)->id(), GetBookmarkType(*it)); |
| 143 } | 143 } |
| 144 } | 144 } |
| 145 } | 145 } |
| 146 | 146 |
| 147 void BookmarksBridge::GetEditablePermanentIDs(JNIEnv* env, | |
| 148 jobject obj, | |
| 149 jobject j_result_obj) { | |
|
Kibeom Kim (inactive)
2014/08/28 05:11:03
nit: alien the jobject arguments to JNIEnv*
Ian Wen
2014/08/28 18:09:56
Done.
| |
| 150 DCHECK(IsLoaded()); | |
| 151 | |
| 152 base::StackVector<const BookmarkNode*, 8> permanent_nodes; | |
| 153 | |
| 154 const BookmarkNode* root_node = bookmark_model_->root_node(); | |
| 155 for (int i = 0; i < root_node->child_count(); ++i) { | |
| 156 permanent_nodes->push_back(root_node->GetChild(i)); | |
| 157 } | |
| 158 permanent_nodes->push_back( | |
| 159 partner_bookmarks_shim_->GetPartnerBookmarksRoot()); | |
|
Kibeom Kim (inactive)
2014/08/28 05:11:03
I thought we cannot add/move nodes to partner book
Ian Wen
2014/08/28 18:09:56
Per comments of DiablePartnerBookmarkEditing(), Pa
| |
| 160 | |
| 161 for (base::StackVector<const BookmarkNode*, 8>::ContainerType::const_iterator | |
| 162 it = permanent_nodes->begin(); | |
| 163 it != permanent_nodes->end(); | |
| 164 ++it) { | |
| 165 if (*it != NULL && client_->CanBeEditedByUser((*it))) { | |
|
Kibeom Kim (inactive)
2014/08/28 05:11:03
IIRC, partner bookmark nodes cannot be queried by
Ian Wen
2014/08/28 18:09:56
Done.
| |
| 166 Java_BookmarksBridge_addToBookmarkIdList( | |
| 167 env, j_result_obj, (*it)->id(), GetBookmarkType(*it)); | |
| 168 } | |
| 169 } | |
| 170 } | |
| 171 | |
| 147 void BookmarksBridge::GetChildIDs(JNIEnv* env, | 172 void BookmarksBridge::GetChildIDs(JNIEnv* env, |
| 148 jobject obj, | 173 jobject obj, |
| 149 jlong id, | 174 jlong id, |
| 150 jint type, | 175 jint type, |
| 151 jboolean get_folders, | 176 jboolean get_folders, |
| 152 jboolean get_bookmarks, | 177 jboolean get_bookmarks, |
| 153 jobject j_result_obj) { | 178 jobject j_result_obj) { |
| 154 DCHECK(IsLoaded()); | 179 DCHECK(IsLoaded()); |
| 155 | 180 |
| 156 const BookmarkNode* parent = GetNodeByID(id, type); | 181 const BookmarkNode* parent = GetNodeByID(id, type); |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 652 BookmarkModelChanged(); | 677 BookmarkModelChanged(); |
| 653 } | 678 } |
| 654 | 679 |
| 655 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 680 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
| 656 NotifyIfDoneLoading(); | 681 NotifyIfDoneLoading(); |
| 657 } | 682 } |
| 658 | 683 |
| 659 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 684 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
| 660 partner_bookmarks_shim_ = NULL; | 685 partner_bookmarks_shim_ = NULL; |
| 661 } | 686 } |
| OLD | NEW |