| 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_array.h" | 7 #include "base/android/jni_array.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/containers/stack_container.h" | 9 #include "base/containers/stack_container.h" |
| 10 #include "base/i18n/string_compare.h" | 10 #include "base/i18n/string_compare.h" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 if (get_special) { | 225 if (get_special) { |
| 226 if (client_->managed_node() && | 226 if (client_->managed_node() && |
| 227 client_->managed_node()->child_count() > 0) { | 227 client_->managed_node()->child_count() > 0) { |
| 228 top_level_folders.push_back(client_->managed_node()); | 228 top_level_folders.push_back(client_->managed_node()); |
| 229 } | 229 } |
| 230 if (client_->supervised_node() && | 230 if (client_->supervised_node() && |
| 231 client_->supervised_node()->child_count() > 0) { | 231 client_->supervised_node()->child_count() > 0) { |
| 232 top_level_folders.push_back(client_->supervised_node()); | 232 top_level_folders.push_back(client_->supervised_node()); |
| 233 } | 233 } |
| 234 if (partner_bookmarks_shim_->HasPartnerBookmarks()) { | 234 if (partner_bookmarks_shim_->HasPartnerBookmarks() |
| 235 && IsReachable(partner_bookmarks_shim_->GetPartnerBookmarksRoot())) { |
| 235 top_level_folders.push_back( | 236 top_level_folders.push_back( |
| 236 partner_bookmarks_shim_->GetPartnerBookmarksRoot()); | 237 partner_bookmarks_shim_->GetPartnerBookmarksRoot()); |
| 237 } | 238 } |
| 238 } | 239 } |
| 239 std::size_t special_count = top_level_folders.size(); | 240 std::size_t special_count = top_level_folders.size(); |
| 240 | 241 |
| 241 if (get_normal) { | 242 if (get_normal) { |
| 242 DCHECK_EQ(bookmark_model_->root_node()->child_count(), 5); | 243 DCHECK_EQ(bookmark_model_->root_node()->child_count(), 5); |
| 243 | 244 |
| 244 const BookmarkNode* mobile_node = bookmark_model_->mobile_node(); | 245 const BookmarkNode* mobile_node = bookmark_model_->mobile_node(); |
| (...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 BookmarkModelChanged(); | 1034 BookmarkModelChanged(); |
| 1034 } | 1035 } |
| 1035 | 1036 |
| 1036 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1037 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
| 1037 NotifyIfDoneLoading(); | 1038 NotifyIfDoneLoading(); |
| 1038 } | 1039 } |
| 1039 | 1040 |
| 1040 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1041 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
| 1041 partner_bookmarks_shim_ = NULL; | 1042 partner_bookmarks_shim_ = NULL; |
| 1042 } | 1043 } |
| OLD | NEW |