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

Unified Diff: chrome/browser/sync/glue/bookmark_model_associator.cc

Issue 12891006: bookmarks: Remove Profile getter accessor from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cocoa alignments Created 7 years, 9 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
Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 9b9e7fece9a2775dd003fd1e453342c2905c5c7d..3b2d6d2a09f24db9a1fe232873b18e2fb2020c8f 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -191,10 +191,12 @@ const BookmarkNode* BookmarkNodeIdIndex::Find(int64 id) const {
BookmarkModelAssociator::BookmarkModelAssociator(
BookmarkModel* bookmark_model,
+ Profile* profile,
syncer::UserShare* user_share,
DataTypeErrorHandler* unrecoverable_error_handler,
bool expect_mobile_bookmarks_folder)
: bookmark_model_(bookmark_model),
+ profile_(profile),
user_share_(user_share),
unrecoverable_error_handler_(unrecoverable_error_handler),
expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder),
@@ -501,6 +503,7 @@ syncer::SyncError BookmarkModelAssociator::BuildAssociations(
BookmarkChangeProcessor::CreateOrUpdateBookmarkNode(
&sync_child_node,
bookmark_model_,
+ profile_,
this);
if (new_child_node != child_node) {
local_merge_result->set_num_items_added(
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.h ('k') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698