components/sync_driver/frontend_data_type_controller.cc - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

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/frontend_data_type_controller.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

Patch Set: Rebase. Created 4 years, 5 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: components/sync_driver/frontend_data_type_controller.cc

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

index 772055fea3a1a34bd7cf7522ccb832fe88dd077b..ab7dffd4f336f9804fed3b8c4702b6b14819360c 100644

--- a/components/sync_driver/frontend_data_type_controller.cc

+++ b/components/sync_driver/frontend_data_type_controller.cc

@@ -6,14 +6,14 @@

#include "base/logging.h"

#include "base/threading/thread_task_runner_handle.h"

+#include "components/sync/api/sync_error.h"

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

+#include "components/sync/base/data_type_histogram.h"

+#include "components/sync/base/model_type.h"

#include "components/sync_driver/change_processor.h"

#include "components/sync_driver/model_associator.h"

#include "components/sync_driver/sync_client.h"

#include "components/sync_driver/sync_service.h"

-#include "sync/api/sync_error.h"

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

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

-#include "sync/util/data_type_histogram.h"

namespace browser_sync {

« build/all.gyp ('K') | « components/sync_driver/frontend_data_type_controller.h ('k') | components/sync_driver/frontend_data_type_controller_mock.h » ('j') | no next file with comments »