Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 396843002: [Android] Fix BookmarksBridge::GetAllBookmarkIDsOrderedByCreationDate . (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 folder_iter != folders.end(); ++folder_iter) { 187 folder_iter != folders.end(); ++folder_iter) {
188 if (*folder_iter == NULL) 188 if (*folder_iter == NULL)
189 continue; 189 continue;
190 190
191 std::list<const BookmarkNode*>::iterator insert_iter = folder_iter; 191 std::list<const BookmarkNode*>::iterator insert_iter = folder_iter;
192 ++insert_iter; 192 ++insert_iter;
193 193
194 for (int i = 0; i < (*folder_iter)->child_count(); ++i) { 194 for (int i = 0; i < (*folder_iter)->child_count(); ++i) {
195 const BookmarkNode* child = (*folder_iter)->GetChild(i); 195 const BookmarkNode* child = (*folder_iter)->GetChild(i);
196 if (!IsFolderAvailable(child) || !IsReachable(child)) 196 if (!IsFolderAvailable(child) || !IsReachable(child))
197 return; 197 continue;
198 198
199 if (child->is_folder()) { 199 if (child->is_folder()) {
200 insert_iter = folders.insert(insert_iter, child); 200 insert_iter = folders.insert(insert_iter, child);
201 } else { 201 } else {
202 result.push_back(child); 202 result.push_back(child);
203 } 203 }
204 } 204 }
205 } 205 }
206 206
207 std::sort( 207 std::sort(
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 BookmarkModelChanged(); 634 BookmarkModelChanged();
635 } 635 }
636 636
637 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { 637 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
638 NotifyIfDoneLoading(); 638 NotifyIfDoneLoading();
639 } 639 }
640 640
641 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { 641 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
642 partner_bookmarks_shim_ = NULL; 642 partner_bookmarks_shim_ = NULL;
643 } 643 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698