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

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

Issue 12313075: [sync] Upstream the Android ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 years, 9 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 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 // Use this encryption bootstrap token if we're using an explicit passphrase. 105 // Use this encryption bootstrap token if we're using an explicit passphrase.
106 std::string GetEncryptionBootstrapToken() const; 106 std::string GetEncryptionBootstrapToken() const;
107 void SetEncryptionBootstrapToken(const std::string& token); 107 void SetEncryptionBootstrapToken(const std::string& token);
108 108
109 // Use this keystore bootstrap token if we're not using an explicit 109 // Use this keystore bootstrap token if we're not using an explicit
110 // passphrase. 110 // passphrase.
111 std::string GetKeystoreEncryptionBootstrapToken() const; 111 std::string GetKeystoreEncryptionBootstrapToken() const;
112 void SetKeystoreEncryptionBootstrapToken(const std::string& token); 112 void SetKeystoreEncryptionBootstrapToken(const std::string& token);
113 113
114 // Use this for the unique machine tag used for session sync.
115 std::string GetSyncSessionsGUID() const;
116 void SetSyncSessionsGUID(const std::string& guid);
117
114 // Maps |data_type| to its corresponding preference name. 118 // Maps |data_type| to its corresponding preference name.
115 static const char* GetPrefNameForDataType(syncer::ModelType data_type); 119 static const char* GetPrefNameForDataType(syncer::ModelType data_type);
116 120
117 #if defined(OS_CHROMEOS) 121 #if defined(OS_CHROMEOS)
118 // Use this spare bootstrap token only when setting up sync for the first 122 // Use this spare bootstrap token only when setting up sync for the first
119 // time. 123 // time.
120 std::string GetSpareBootstrapToken() const; 124 std::string GetSpareBootstrapToken() const;
121 void SetSpareBootstrapToken(const std::string& token); 125 void SetSpareBootstrapToken(const std::string& token);
122 #endif 126 #endif
123 127
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // etc. 167 // etc.
164 typedef std::map<syncer::ModelType, syncer::ModelTypeSet> PrefGroupsMap; 168 typedef std::map<syncer::ModelType, syncer::ModelTypeSet> PrefGroupsMap;
165 PrefGroupsMap pref_groups_; 169 PrefGroupsMap pref_groups_;
166 170
167 DISALLOW_COPY_AND_ASSIGN(SyncPrefs); 171 DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
168 }; 172 };
169 173
170 } // namespace browser_sync 174 } // namespace browser_sync
171 175
172 #endif // CHROME_BROWSER_SYNC_SYNC_PREFS_H_ 176 #endif // CHROME_BROWSER_SYNC_SYNC_PREFS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698