Index: chrome/browser/sync/glue/sync_backend_host.h |
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h |
index de14e252588629c9fd0e8e9488c620fa91dbcf91..81f9d71a7c5cd450d2b253c3a352bce76c036a8b 100644 |
--- a/chrome/browser/sync/glue/sync_backend_host.h |
+++ b/chrome/browser/sync/glue/sync_backend_host.h |
@@ -17,6 +17,7 @@ |
#include "chrome/browser/sync/glue/backend_data_type_configurer.h" |
#include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h" |
#include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h" |
+#include "chrome/browser/sync/glue/sync_backend_registrar.h" |
Nicolas Zea
2012/07/20 21:35:39
Any reason you're not forward declaring this anymo
rlarocque
2012/07/20 23:20:05
No. Fixed.
|
#include "chrome/common/net/gaia/google_service_auth_error.h" |
#include "googleurl/src/gurl.h" |
#include "sync/internal_api/public/base/model_type.h" |
@@ -43,9 +44,6 @@ namespace browser_sync { |
class ChangeProcessor; |
struct Experiments; |
class InvalidatorStorage; |
-class JsBackend; |
-class JsEventHandler; |
-class SyncBackendRegistrar; |
class SyncPrefs; |
// SyncFrontend is the interface used by SyncBackendHost to communicate with |
@@ -170,7 +168,6 @@ class SyncBackendHost : public BackendDataTypeConfigurer { |
SyncFrontend* frontend, |
const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, |
const GURL& service_url, |
- syncer::ModelTypeSet initial_types, |
const syncer::SyncCredentials& credentials, |
bool delete_sync_data_folder, |
syncer::SyncManagerFactory* sync_manager_factory, |
@@ -250,6 +247,9 @@ class SyncBackendHost : public BackendDataTypeConfigurer { |
// for creating transactions. |
syncer::UserShare* GetUserShare() const; |
+ // Same as the above function, but bypasses a few sanity checks. |
+ syncer::UserShare* GetUserShareForTest() const; |
+ |
// Called from any thread to obtain current status information in detailed or |
// summarized form. |
Status GetDetailedStatus(); |
@@ -345,6 +345,11 @@ class SyncBackendHost : public BackendDataTypeConfigurer { |
const syncer::ModelTypeSet configured_types, |
const base::Callback<void(syncer::ModelTypeSet)>& ready_task); |
+ // Called when the SyncManager has been constructed and initialized. |
+ virtual void HandleSyncManagerInitializationOnFrontendLoop( |
+ const syncer::WeakHandle<syncer::JsBackend>& js_backend, bool success, |
+ syncer::ModelTypeSet restored_types); |
+ |
private: |
// The real guts of SyncBackendHost, to keep the public client API clean. |
class Core; |