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

Unified Diff: sync/internal_api/sync_manager_impl.cc

Issue 11360259: Sync: Add DeviceInfo's ChangeProcessor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix sync_client.cc Created 8 years, 1 month 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 | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/sync_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index bd528f70fb058685111e9c7f3b584e647c4edb45..dbb8839bb95db55c2f9ce8e06e3bd04386e118bd 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -47,7 +47,6 @@
#include "sync/syncable/entry.h"
#include "sync/syncable/in_memory_directory_backing_store.h"
#include "sync/syncable/on_disk_directory_backing_store.h"
-#include "sync/util/get_session_name.h"
using base::TimeDelta;
using sync_pb::GetUpdatesCallerInfo;
@@ -335,7 +334,6 @@ void SyncManagerImpl::Init(
const std::string& sync_server_and_path,
int port,
bool use_ssl,
- const scoped_refptr<base::TaskRunner>& blocking_task_runner,
scoped_ptr<HttpPostProviderFactory> post_factory,
const std::vector<ModelSafeWorker*>& workers,
ExtensionsActivityMonitor* extensions_activity_monitor,
@@ -357,8 +355,6 @@ void SyncManagerImpl::Init(
weak_handle_this_ = MakeWeakHandle(weak_ptr_factory_.GetWeakPtr());
- blocking_task_runner_ = blocking_task_runner;
-
change_delegate_ = change_delegate;
invalidator_ = invalidator.Pass();
@@ -1296,6 +1292,11 @@ UserShare* SyncManagerImpl::GetUserShare() {
return &share_;
}
+const std::string SyncManagerImpl::cache_guid() {
+ DCHECK(initialized_);
+ return directory()->cache_guid();
+}
+
bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
ReadTransaction trans(FROM_HERE, GetUserShare());
ReadNode nigori_node(&trans);
« no previous file with comments | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/sync_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698