summaryrefslogtreecommitdiffstats
path: root/components/sync_driver/non_blocking_data_type_controller.cc
diff options
context:
space:
mode:
authorstanisc <stanisc@chromium.org>2015-08-14 11:59:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-14 18:59:43 +0000
commit96665bd16904214c738e7edf6fe7399ae83b9146 (patch)
tree301262d329e9701a0a00ea543bbb7fc9aaf9668f /components/sync_driver/non_blocking_data_type_controller.cc
parentdd0208e1701d7fee6b8104f19bda9a817924c4a3 (diff)
downloadchromium_src-96665bd16904214c738e7edf6fe7399ae83b9146.zip
chromium_src-96665bd16904214c738e7edf6fe7399ae83b9146.tar.gz
chromium_src-96665bd16904214c738e7edf6fe7399ae83b9146.tar.bz2
move V2 classes in chrome/engine to syncer_v2 namespace
BUG=516512 Review URL: https://codereview.chromium.org/1285443002 Cr-Commit-Position: refs/heads/master@{#343452}
Diffstat (limited to 'components/sync_driver/non_blocking_data_type_controller.cc')
-rw-r--r--components/sync_driver/non_blocking_data_type_controller.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/components/sync_driver/non_blocking_data_type_controller.cc b/components/sync_driver/non_blocking_data_type_controller.cc
index 54d8071..4e7f4f2 100644
--- a/components/sync_driver/non_blocking_data_type_controller.cc
+++ b/components/sync_driver/non_blocking_data_type_controller.cc
@@ -21,7 +21,7 @@ NonBlockingDataTypeController::~NonBlockingDataTypeController() {}
void NonBlockingDataTypeController::InitializeType(
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
- const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy) {
+ const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& type_sync_proxy) {
DCHECK(!IsSyncProxyConnected());
task_runner_ = task_runner;
type_sync_proxy_ = type_sync_proxy;
@@ -86,8 +86,7 @@ void NonBlockingDataTypeController::SendEnableSignal() {
task_runner_->PostTask(
FROM_HERE,
- base::Bind(&syncer::ModelTypeSyncProxyImpl::Enable,
- type_sync_proxy_,
+ base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::Enable, type_sync_proxy_,
base::Passed(sync_context_proxy_->Clone())));
current_state_ = ENABLED;
}
@@ -95,9 +94,9 @@ void NonBlockingDataTypeController::SendEnableSignal() {
void NonBlockingDataTypeController::SendDisableSignal() {
DCHECK_EQ(DISABLED, GetDesiredState());
DVLOG(1) << "Disabling non-blocking sync type " << ModelTypeToString(type_);
- task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&syncer::ModelTypeSyncProxyImpl::Disable, type_sync_proxy_));
+ task_runner_->PostTask(FROM_HERE,
+ base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::Disable,
+ type_sync_proxy_));
current_state_ = DISABLED;
}
@@ -105,9 +104,9 @@ void NonBlockingDataTypeController::SendDisconnectSignal() {
DCHECK_EQ(DISCONNECTED, GetDesiredState());
DVLOG(1) << "Disconnecting non-blocking sync type "
<< ModelTypeToString(type_);
- task_runner_->PostTask(FROM_HERE,
- base::Bind(&syncer::ModelTypeSyncProxyImpl::Disconnect,
- type_sync_proxy_));
+ task_runner_->PostTask(
+ FROM_HERE, base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::Disconnect,
+ type_sync_proxy_));
current_state_ = DISCONNECTED;
}