components/sync/driver/non_ui_data_type_controller.h - Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver.

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/non_ui_data_type_controller.h

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a

Patch Set: Full change rebased on static lib. Created 4 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

« no previous file with comments | « components/sync/driver/non_blocking_data_type_controller_unittest.cc ('k') | components/sync/driver/non_ui_data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync/driver/non_ui_data_type_controller.h

diff --git a/components/sync_driver/non_ui_data_type_controller.h b/components/sync/driver/non_ui_data_type_controller.h

similarity index 94%

rename from components/sync_driver/non_ui_data_type_controller.h

rename to components/sync/driver/non_ui_data_type_controller.h

index d3c850b96c388d60215abdcd30618fd7d7e8de0e..3dcabaa3a93e35c2e032458b786129cae8de3a0c 100644

--- a/components/sync_driver/non_ui_data_type_controller.h

+++ b/components/sync/driver/non_ui_data_type_controller.h

@@ -10,8 +10,8 @@

#include "base/compiler_specific.h"

#include "base/memory/ref_counted.h"

#include "base/memory/weak_ptr.h"

-#include "components/sync_driver/directory_data_type_controller.h"

-#include "components/sync_driver/shared_change_processor.h"

+#include "components/sync/driver/directory_data_type_controller.h"

+#include "components/sync/driver/shared_change_processor.h"

namespace syncer {

class SyncableService;

@@ -70,10 +70,9 @@ class NonUIDataTypeController : public DirectoryDataTypeController {

// Start up complete, update the state and invoke the callback.

// Note: this is performed on the datatype's thread.

- virtual void StartDone(

- DataTypeController::ConfigureResult start_result,

- const syncer::SyncMergeResult& local_merge_result,

- const syncer::SyncMergeResult& syncer_merge_result);

+ virtual void StartDone(DataTypeController::ConfigureResult start_result,

+ const syncer::SyncMergeResult& local_merge_result,

+ const syncer::SyncMergeResult& syncer_merge_result);

// UI thread implementation of StartDone.

virtual void StartDoneImpl(