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

Unified Diff: chrome/browser/sync/glue/sync_backend_host_core.h

Issue 395013002: Pass signin_scoped_device_id to DeviceInfoSpecifics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Revers chrome_signin_client Created 6 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
« no previous file with comments | « chrome/browser/sync/glue/device_info.cc ('k') | chrome/browser/sync/glue/sync_backend_host_core.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/sync_backend_host_core.h
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.h b/chrome/browser/sync/glue/sync_backend_host_core.h
index 635a3312c17965589dc4abb38a977f7bf668a351..9b1ba67e1719c5eb891a1eb58794636684bce7d9 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.h
+++ b/chrome/browser/sync/glue/sync_backend_host_core.h
@@ -36,12 +36,11 @@ struct DoInitializeOptions {
bool delete_sync_data_folder,
const std::string& restored_key_for_bootstrapping,
const std::string& restored_keystore_key_for_bootstrapping,
- scoped_ptr<syncer::InternalComponentsFactory>
- internal_components_factory,
- scoped_ptr<syncer::UnrecoverableErrorHandler>
- unrecoverable_error_handler,
+ scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
+ scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler,
syncer::ReportUnrecoverableErrorFunction
- report_unrecoverable_error_function);
+ report_unrecoverable_error_function,
+ const std::string& signin_scoped_device_id);
~DoInitializeOptions();
base::MessageLoop* sync_loop;
@@ -64,6 +63,7 @@ struct DoInitializeOptions {
scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler;
syncer::ReportUnrecoverableErrorFunction
report_unrecoverable_error_function;
+ std::string signin_scoped_device_id;
};
// Helper struct to handle currying params to
@@ -322,6 +322,10 @@ class SyncBackendHostCore
// Set when the forwarding of per-type debug counters is enabled.
bool forward_type_info_;
+ // Obtained from SigninClient::GetSigninScopedDeviceId(). Stored here just to
+ // pass from SyncBackendHostImpl to SyncedDeviceTracker.
+ std::string signin_scoped_device_id_;
+
base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
« no previous file with comments | « chrome/browser/sync/glue/device_info.cc ('k') | chrome/browser/sync/glue/sync_backend_host_core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698