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

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

Issue 10235013: [Sync] Add support for automatic enabling of syncing tab favicons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert testserver for now Created 8 years, 8 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/sync_backend_host_unittest.cc ('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
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 4227e8d4b692598c64fafa0e116c1aa825ba278e..0007b6ac951e582079b6282514a64d3df15d8cdd 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -35,6 +35,7 @@
#include "sync/engine/model_safe_worker.h"
#include "sync/js/sync_js_controller.h"
#include "sync/syncable/model_type.h"
+#include "sync/util/experiments.h"
#include "sync/util/unrecoverable_error_handler.h"
class Profile;
@@ -235,8 +236,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
virtual void OnEncryptionComplete() OVERRIDE;
virtual void OnMigrationNeededForTypes(
syncable::ModelTypeSet types) OVERRIDE;
- virtual void OnDataTypesChanged(
- syncable::ModelTypeSet to_add) OVERRIDE;
+ virtual void OnExperimentsChanged(
+ const browser_sync::Experiments& experiments) OVERRIDE;
virtual void OnActionableError(
const browser_sync::SyncProtocolError& error) OVERRIDE;
@@ -741,6 +742,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// data types.
bool setup_in_progress_;
+ // The set of currently enabled sync experiments.
+ browser_sync::Experiments current_experiments;
+
DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
};
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host_unittest.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698