Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(669)

Unified Diff: components/sync/driver/proxy_data_type_controller.cc

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/proxy_data_type_controller.h ('k') | components/sync/driver/resources/about.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/proxy_data_type_controller.cc
diff --git a/components/sync_driver/proxy_data_type_controller.cc b/components/sync/driver/proxy_data_type_controller.cc
similarity index 90%
rename from components/sync_driver/proxy_data_type_controller.cc
rename to components/sync/driver/proxy_data_type_controller.cc
index b0e382446bc45de0226b34984d7822e6bc95d749..99c74b78c856366553531f3c283eedf70a852041 100644
--- a/components/sync_driver/proxy_data_type_controller.cc
+++ b/components/sync/driver/proxy_data_type_controller.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/sync_driver/proxy_data_type_controller.h"
+#include "components/sync/driver/proxy_data_type_controller.h"
#include "components/sync/api/sync_merge_result.h"
@@ -17,8 +17,7 @@ ProxyDataTypeController::ProxyDataTypeController(
DCHECK(syncer::ProxyTypes().Has(type_));
}
-ProxyDataTypeController::~ProxyDataTypeController() {
-}
+ProxyDataTypeController::~ProxyDataTypeController() {}
bool ProxyDataTypeController::ShouldLoadModelBeforeConfigure() const {
return false;
@@ -38,8 +37,7 @@ void ProxyDataTypeController::StartAssociating(
syncer::SyncMergeResult local_merge_result(type_);
syncer::SyncMergeResult syncer_merge_result(type_);
state_ = RUNNING;
- start_callback.Run(DataTypeController::OK,
- local_merge_result,
+ start_callback.Run(DataTypeController::OK, local_merge_result,
syncer_merge_result);
}
« no previous file with comments | « components/sync/driver/proxy_data_type_controller.h ('k') | components/sync/driver/resources/about.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698