| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 top_level_folders.push_back( | 235 top_level_folders.push_back( |
| 236 partner_bookmarks_shim_->GetPartnerBookmarksRoot()); | 236 partner_bookmarks_shim_->GetPartnerBookmarksRoot()); |
| 237 } | 237 } |
| 238 } | 238 } |
| 239 std::size_t special_count = top_level_folders.size(); | 239 std::size_t special_count = top_level_folders.size(); |
| 240 | 240 |
| 241 if (get_normal) { | 241 if (get_normal) { |
| 242 DCHECK_EQ(bookmark_model_->root_node()->child_count(), 4); | 242 DCHECK_EQ(bookmark_model_->root_node()->child_count(), 5); |
| 243 | 243 |
| 244 const BookmarkNode* mobile_node = bookmark_model_->mobile_node(); | 244 const BookmarkNode* mobile_node = bookmark_model_->mobile_node(); |
| 245 for (int i = 0; i < mobile_node->child_count(); ++i) { | 245 for (int i = 0; i < mobile_node->child_count(); ++i) { |
| 246 const BookmarkNode* node = mobile_node->GetChild(i); | 246 const BookmarkNode* node = mobile_node->GetChild(i); |
| 247 if (node->is_folder()) { | 247 if (node->is_folder()) { |
| 248 top_level_folders.push_back(node); | 248 top_level_folders.push_back(node); |
| 249 } | 249 } |
| 250 } | 250 } |
| 251 | 251 |
| 252 const BookmarkNode* bookmark_bar_node = | 252 const BookmarkNode* bookmark_bar_node = |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1024 BookmarkModelChanged(); | 1024 BookmarkModelChanged(); |
| 1025 } | 1025 } |
| 1026 | 1026 |
| 1027 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1027 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
| 1028 NotifyIfDoneLoading(); | 1028 NotifyIfDoneLoading(); |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1031 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
| 1032 partner_bookmarks_shim_ = NULL; | 1032 partner_bookmarks_shim_ = NULL; |
| 1033 } | 1033 } |
| OLD | NEW |