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

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

Issue 1059523005: Remove dependency on //chrome from bookmark_undo_utils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tests
Patch Set: Created 5 years, 8 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 e8f561967e92a994dd8355ca5f75bb9001516398..d8b7193af42ce2caa886673665624cc9732323ef 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -420,7 +420,8 @@ syncer::SyncError BookmarkModelAssociator::AssociateModels(
syncer::SyncMergeResult* syncer_merge_result) {
// Since any changes to the bookmark model made here are not user initiated,
// these change should not be undoable and so suspend the undo tracking.
- ScopedSuspendBookmarkUndo suspend_undo(profile_);
+ ScopedSuspendBookmarkUndo suspend_undo(
+ BookmarkUndoServiceFactory::GetForProfileIfExists(profile_));
syncer::SyncError error = CheckModelSyncState(local_merge_result,
syncer_merge_result);
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | chrome/browser/undo/bookmark_undo_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698