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

Side by Side Diff: chrome/browser/sync/sync_prefs.h

Issue 9956097: suppress user/password dialog when re-enabling sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Spare Bootstrap token. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_SYNC_PREFS_H_ 5 #ifndef CHROME_BROWSER_SYNC_SYNC_PREFS_H_
6 #define CHROME_BROWSER_SYNC_SYNC_PREFS_H_ 6 #define CHROME_BROWSER_SYNC_SYNC_PREFS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 void SetPreferredDataTypes( 91 void SetPreferredDataTypes(
92 syncable::ModelTypeSet registered_types, 92 syncable::ModelTypeSet registered_types,
93 syncable::ModelTypeSet preferred_types); 93 syncable::ModelTypeSet preferred_types);
94 94
95 // This pref is set outside of sync. 95 // This pref is set outside of sync.
96 bool IsManaged() const; 96 bool IsManaged() const;
97 97
98 std::string GetEncryptionBootstrapToken() const; 98 std::string GetEncryptionBootstrapToken() const;
99 void SetEncryptionBootstrapToken(const std::string& token); 99 void SetEncryptionBootstrapToken(const std::string& token);
100 100
101 std::string GetSpareBootstrapToken() const;
Nicolas Zea 2012/04/03 21:00:33 Comment that this bootstrap token is used only whe
kochi 2012/04/03 22:45:43 Done.
102 void SetSpareBootstrapToken(const std::string& token);
103
101 // InvalidationVersionTracker implementation. 104 // InvalidationVersionTracker implementation.
102 virtual sync_notifier::InvalidationVersionMap 105 virtual sync_notifier::InvalidationVersionMap
103 GetAllMaxVersions() const OVERRIDE; 106 GetAllMaxVersions() const OVERRIDE;
104 virtual void SetMaxVersion(syncable::ModelType model_type, 107 virtual void SetMaxVersion(syncable::ModelType model_type,
105 int64 max_version) OVERRIDE; 108 int64 max_version) OVERRIDE;
106 109
107 // Merges the given set of types with the set of acknowledged types. 110 // Merges the given set of types with the set of acknowledged types.
108 void AcknowledgeSyncedTypes(syncable::ModelTypeSet types); 111 void AcknowledgeSyncedTypes(syncable::ModelTypeSet types);
109 112
110 // content::NotificationObserver implementation. 113 // content::NotificationObserver implementation.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // etc. 155 // etc.
153 typedef std::map<syncable::ModelType, syncable::ModelTypeSet> PrefGroupsMap; 156 typedef std::map<syncable::ModelType, syncable::ModelTypeSet> PrefGroupsMap;
154 PrefGroupsMap pref_groups_; 157 PrefGroupsMap pref_groups_;
155 158
156 DISALLOW_COPY_AND_ASSIGN(SyncPrefs); 159 DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
157 }; 160 };
158 161
159 } // namespace browser_sync 162 } // namespace browser_sync
160 163
161 #endif // CHROME_BROWSER_SYNC_SYNC_PREFS_H_ 164 #endif // CHROME_BROWSER_SYNC_SYNC_PREFS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698