components/sync_driver/model_association_manager.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: components/sync_driver/model_association_manager.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: Fixing build on Android Created 5 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

« components/sync_driver/directory_data_type_controller.h ('K') | « components/sync_driver/generic_change_processor.h ('k') | components/sync_driver/non_ui_data_type_controller.h » ('j') | components/sync_driver/proxy_data_type_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/model_association_manager.cc

diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc

index 6924712fecabb73ca02a507856dfc786753c3fa7..7602385a1071eb79302697fc74d8853b9030a8ee 100644

--- a/components/sync_driver/model_association_manager.cc

+++ b/components/sync_driver/model_association_manager.cc

@@ -11,6 +11,7 @@

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram_macros.h"

#include "base/trace_event/trace_event.h"

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

#include "sync/internal_api/public/base/model_type.h"

using syncer::ModelTypeSet;