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

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

Issue 10656033: [sync] Automatic bootstrapping of Sync on Win 8 from cached credentials (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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
« no previous file with comments | « chrome/browser/sync/sync_prefs.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/sync/sync_prefs.h" 5 #include "chrome/browser/sync/sync_prefs.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 return 170 return
171 pref_service_ ? 171 pref_service_ ?
172 pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) : ""; 172 pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) : "";
173 } 173 }
174 174
175 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) { 175 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
176 DCHECK(CalledOnValidThread()); 176 DCHECK(CalledOnValidThread());
177 pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token); 177 pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token);
178 } 178 }
179 179
180 // static
181 const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) {
182 switch (data_type) {
183 case syncer::BOOKMARKS:
184 return prefs::kSyncBookmarks;
185 case syncer::PASSWORDS:
186 return prefs::kSyncPasswords;
187 case syncer::PREFERENCES:
188 return prefs::kSyncPreferences;
189 case syncer::AUTOFILL:
190 return prefs::kSyncAutofill;
191 case syncer::AUTOFILL_PROFILE:
192 return prefs::kSyncAutofillProfile;
193 case syncer::THEMES:
194 return prefs::kSyncThemes;
195 case syncer::TYPED_URLS:
196 return prefs::kSyncTypedUrls;
197 case syncer::EXTENSION_SETTINGS:
198 return prefs::kSyncExtensionSettings;
199 case syncer::EXTENSIONS:
200 return prefs::kSyncExtensions;
201 case syncer::APP_SETTINGS:
202 return prefs::kSyncAppSettings;
203 case syncer::APPS:
204 return prefs::kSyncApps;
205 case syncer::SEARCH_ENGINES:
206 return prefs::kSyncSearchEngines;
207 case syncer::SESSIONS:
208 return prefs::kSyncSessions;
209 case syncer::APP_NOTIFICATIONS:
210 return prefs::kSyncAppNotifications;
211 default:
212 break;
213 }
214 NOTREACHED();
215 return NULL;
216 }
217
180 #if defined(OS_CHROMEOS) 218 #if defined(OS_CHROMEOS)
181 std::string SyncPrefs::GetSpareBootstrapToken() const { 219 std::string SyncPrefs::GetSpareBootstrapToken() const {
182 DCHECK(CalledOnValidThread()); 220 DCHECK(CalledOnValidThread());
183 return pref_service_ ? 221 return pref_service_ ?
184 pref_service_->GetString(prefs::kSyncSpareBootstrapToken) : ""; 222 pref_service_->GetString(prefs::kSyncSpareBootstrapToken) : "";
185 } 223 }
186 224
187 void SyncPrefs::SetSpareBootstrapToken(const std::string& token) { 225 void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
188 DCHECK(CalledOnValidThread()); 226 DCHECK(CalledOnValidThread());
189 pref_service_->SetString(prefs::kSyncSpareBootstrapToken, token); 227 pref_service_->SetString(prefs::kSyncSpareBootstrapToken, token);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 272
235 syncer::ModelTypeSet SyncPrefs::GetAcknowledgeSyncedTypesForTest() const { 273 syncer::ModelTypeSet SyncPrefs::GetAcknowledgeSyncedTypesForTest() const {
236 DCHECK(CalledOnValidThread()); 274 DCHECK(CalledOnValidThread());
237 if (!pref_service_) { 275 if (!pref_service_) {
238 return syncer::ModelTypeSet(); 276 return syncer::ModelTypeSet();
239 } 277 }
240 return syncer::ModelTypeSetFromValue( 278 return syncer::ModelTypeSetFromValue(
241 *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes)); 279 *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes));
242 } 280 }
243 281
244 namespace {
245
246 const char* GetPrefNameForDataType(syncer::ModelType data_type) {
247 switch (data_type) {
248 case syncer::BOOKMARKS:
249 return prefs::kSyncBookmarks;
250 case syncer::PASSWORDS:
251 return prefs::kSyncPasswords;
252 case syncer::PREFERENCES:
253 return prefs::kSyncPreferences;
254 case syncer::AUTOFILL:
255 return prefs::kSyncAutofill;
256 case syncer::AUTOFILL_PROFILE:
257 return prefs::kSyncAutofillProfile;
258 case syncer::THEMES:
259 return prefs::kSyncThemes;
260 case syncer::TYPED_URLS:
261 return prefs::kSyncTypedUrls;
262 case syncer::EXTENSION_SETTINGS:
263 return prefs::kSyncExtensionSettings;
264 case syncer::EXTENSIONS:
265 return prefs::kSyncExtensions;
266 case syncer::APP_SETTINGS:
267 return prefs::kSyncAppSettings;
268 case syncer::APPS:
269 return prefs::kSyncApps;
270 case syncer::SEARCH_ENGINES:
271 return prefs::kSyncSearchEngines;
272 case syncer::SESSIONS:
273 return prefs::kSyncSessions;
274 case syncer::APP_NOTIFICATIONS:
275 return prefs::kSyncAppNotifications;
276 default:
277 break;
278 }
279 NOTREACHED();
280 return NULL;
281 }
282
283 } // namespace
284
285 void SyncPrefs::RegisterPrefGroups() { 282 void SyncPrefs::RegisterPrefGroups() {
286 pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS); 283 pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS);
287 pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS); 284 pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS);
288 285
289 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE); 286 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE);
290 287
291 pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS); 288 pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS);
292 289
293 pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES); 290 pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES);
294 } 291 }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 if (types.Has(i->first)) 415 if (types.Has(i->first))
419 types_with_groups.PutAll(i->second); 416 types_with_groups.PutAll(i->second);
420 else 417 else
421 types_with_groups.RemoveAll(i->second); 418 types_with_groups.RemoveAll(i->second);
422 } 419 }
423 types_with_groups.RetainAll(registered_types); 420 types_with_groups.RetainAll(registered_types);
424 return types_with_groups; 421 return types_with_groups;
425 } 422 }
426 423
427 } // namespace browser_sync 424 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_prefs.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698