Index: chrome/browser/sync/profile_sync_service.h |
=================================================================== |
--- chrome/browser/sync/profile_sync_service.h (revision 56023) |
+++ chrome/browser/sync/profile_sync_service.h (working copy) |
@@ -19,6 +19,7 @@ |
#include "chrome/browser/pref_member.h" |
#include "chrome/browser/sync/glue/data_type_controller.h" |
#include "chrome/browser/sync/glue/data_type_manager.h" |
+#include "chrome/browser/sync/glue/session_model_associator.h" |
#include "chrome/browser/sync/glue/sync_backend_host.h" |
#include "chrome/browser/sync/notification_method.h" |
#include "chrome/browser/sync/profile_sync_service_observer.h" |
@@ -128,6 +129,11 @@ |
void RegisterDataTypeController( |
browser_sync::DataTypeController* data_type_controller); |
+ // Returns the session model associator associated with this type, but only if |
+ // the associator is running. If it is doing anything else, it will return |
+ // null. |
+ browser_sync::SessionModelAssociator* GetSessionModelAssociator(); |
+ |
// Fills state_map with a map of current data types that are possible to |
// sync, as well as their states. |
void GetDataTypeControllerStates( |
@@ -296,6 +302,10 @@ |
// NotificationService when the outcome is known. |
virtual void SetPassphrase(const std::string& passphrase); |
+ // Returns whether processing changes is allowed. Check this before doing |
+ // any model-modifying operations. |
+ bool ShouldPushChanges(); |
+ |
protected: |
// Used by ProfileSyncServiceMock only. |
// |
@@ -307,10 +317,6 @@ |
// Helper to install and configure a data type manager. |
void ConfigureDataTypeManager(); |
- // Returns whether processing changes is allowed. Check this before doing |
- // any model-modifying operations. |
- bool ShouldPushChanges(); |
- |
// Starts up the backend sync components. |
void StartUp(); |
// Shuts down the backend sync components. |
@@ -345,6 +351,7 @@ |
private: |
friend class ProfileSyncServiceTest; |
friend class ProfileSyncServicePreferenceTest; |
+ friend class ProfileSyncServiceSessionTest; |
friend class ProfileSyncServiceTestHarness; |
FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState); |
FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, |