chrome/browser/sync/glue/bookmark_model_associator.cc - Issue 1090993003: Move undo files into //components/undo

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1090993003: Move undo files into //components/undo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@utils

Patch Set: Fix gn compilation 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:

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 d8b7193af42ce2caa886673665624cc9732323ef..08008baf7f652cf3b7ce73b3cd3fdff7f5eb6f12 100644

--- a/chrome/browser/sync/glue/bookmark_model_associator.cc

+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc

@@ -19,11 +19,11 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/glue/bookmark_change_processor.h"

-#include "chrome/browser/undo/bookmark_undo_service.h"

#include "chrome/browser/undo/bookmark_undo_service_factory.h"

-#include "chrome/browser/undo/bookmark_undo_utils.h"

#include "components/bookmarks/browser/bookmark_client.h"

#include "components/bookmarks/browser/bookmark_model.h"

+#include "components/undo/bookmark_undo_service.h"

+#include "components/undo/bookmark_undo_utils.h"

#include "content/public/browser/browser_thread.h"

#include "sync/api/sync_error.h"

#include "sync/internal_api/public/delete_journal.h"