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

Unified Diff: chrome/browser/bookmarks/bookmark_model.cc

Issue 20521005: BookmarkModel::ReorderChildren to take const BookmarkNodes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reinterpret_cast Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.h ('k') | chrome/browser/bookmarks/bookmark_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 493395a528b5f19fd26550d1c59635a5cfa25ce0..304218ee506357300ef33dfbb259fc17fc230b72 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -675,7 +675,7 @@ void BookmarkModel::SortChildren(const BookmarkNode* parent) {
void BookmarkModel::ReorderChildren(
const BookmarkNode* parent,
- const std::vector<BookmarkNode*>& ordered_nodes) {
+ const std::vector<const BookmarkNode*>& ordered_nodes) {
// Ensure that all children in |parent| are in |ordered_nodes|.
DCHECK_EQ(static_cast<size_t>(parent->child_count()), ordered_nodes.size());
for (size_t i = 0; i < ordered_nodes.size(); ++i)
@@ -684,7 +684,8 @@ void BookmarkModel::ReorderChildren(
FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
OnWillReorderBookmarkNode(this, parent));
- AsMutable(parent)->SetChildren(ordered_nodes);
+ AsMutable(parent)->SetChildren(
+ *(reinterpret_cast<const std::vector<BookmarkNode*>*>(&ordered_nodes)));
if (store_.get())
store_->ScheduleSave();
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.h ('k') | chrome/browser/bookmarks/bookmark_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698