chrome/browser/sync/glue/bookmark_model_associator.cc - Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes.

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 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed CR comments Created 5 years, 3 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/sync/glue/bookmark_model_associator.h ('k') | chrome/browser/sync/glue/non_frontend_data_type_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2d792687a9dfb53b531ef5a85404064d7c1d8e81..995567669585f64121d277ea8b3a7deaa1ec8e15 100644

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

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

@@ -26,6 +26,7 @@

#include "components/undo/bookmark_undo_utils.h"

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

#include "sync/api/sync_error.h"

+#include "sync/api/sync_merge_result.h"

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

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

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