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

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 3168009: Added classes to enable session sync functionality.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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/profile_sync_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698