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

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

Issue 480513004: Stopping the history recording for a supervised user (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge master after style changes. Created 6 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
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 4c99c4d48b662037a3de66a58d21b33ce53fd907..ed1bf6a3b7f57797d490fdbae0a3ec1ce4a92ede 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -493,6 +493,14 @@ class ProfileSyncService : public ProfileSyncServiceBase,
// that data download starts.
Nicolas Zea 2014/09/29 17:50:32 nit: comment that this will trigger ReconfigureDat
virtual void SetSetupInProgress(bool setup_in_progress);
+ // Reconfigures the data type manager with the latest enabled types.
+ // Note: Does not initialize the backend if it is not already initialized.
+ // This function needs to be called only after sync has been initialized
+ // (i.e.,only for reconfigurations). The reason we don't initialize the
+ // backend is because if we had encountered an unrecoverable error we don't
+ // want to startup once more.
+ virtual void ReconfigureDatatypeManager();
+
// Returns true if the SyncBackendHost has told us it's ready to accept
// changes.
// [REMARK] - it is safe to call this function only from the ui thread.
@@ -915,14 +923,6 @@ class ProfileSyncService : public ProfileSyncServiceBase,
// Create and register a new datatype controller.
void RegisterNewDataType(syncer::ModelType data_type);
- // Reconfigures the data type manager with the latest enabled types.
- // Note: Does not initialize the backend if it is not already initialized.
- // This function needs to be called only after sync has been initialized
- // (i.e.,only for reconfigurations). The reason we don't initialize the
- // backend is because if we had encountered an unrecoverable error we don't
- // want to startup once more.
- virtual void ReconfigureDatatypeManager();
-
// Collects preferred sync data types from |preference_providers_|.
syncer::ModelTypeSet GetDataTypesFromPreferenceProviders() const;

Powered by Google App Engine
This is Rietveld 408576698