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

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

Issue 1851004: Adding sync support for Passwords (Closed)
Patch Set: Ready for checkin Created 10 years, 7 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // TODO(nick): Perhaps a better model would be to always default to false, 199 // TODO(nick): Perhaps a better model would be to always default to false,
200 // and explicitly call SetDataTypes() when the user shows the wizard. 200 // and explicitly call SetDataTypes() when the user shows the wizard.
201 #if defined(OS_CHROMEOS) 201 #if defined(OS_CHROMEOS)
202 bool enable_by_default = true; 202 bool enable_by_default = true;
203 #else 203 #else
204 bool enable_by_default = 204 bool enable_by_default =
205 !pref_service->HasPrefPath(prefs::kSyncHasSetupCompleted); 205 !pref_service->HasPrefPath(prefs::kSyncHasSetupCompleted);
206 #endif 206 #endif
207 207
208 pref_service->RegisterBooleanPref(prefs::kSyncBookmarks, true); 208 pref_service->RegisterBooleanPref(prefs::kSyncBookmarks, true);
209 pref_service->RegisterBooleanPref(prefs::kSyncPasswords, enable_by_default);
209 pref_service->RegisterBooleanPref(prefs::kSyncPreferences, enable_by_default); 210 pref_service->RegisterBooleanPref(prefs::kSyncPreferences, enable_by_default);
210 pref_service->RegisterBooleanPref(prefs::kSyncAutofill, enable_by_default); 211 pref_service->RegisterBooleanPref(prefs::kSyncAutofill, enable_by_default);
211 pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default); 212 pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default);
212 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, enable_by_default); 213 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, enable_by_default);
213 214
214 // TODO(albertb): Consider getting rid of this preference once we have a UI 215 // TODO(albertb): Consider getting rid of this preference once we have a UI
215 // for per-data type disabling. 216 // for per-data type disabling.
216 if (bootstrap_sync_authentication_ && 217 if (bootstrap_sync_authentication_ &&
217 !pref_service->FindPreference(prefs::kSyncBootstrappedAuth)) 218 !pref_service->FindPreference(prefs::kSyncBootstrappedAuth))
218 pref_service->RegisterBooleanPref(prefs::kSyncBootstrappedAuth, false); 219 pref_service->RegisterBooleanPref(prefs::kSyncBootstrappedAuth, false);
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 last_synced_time_.ToInternalValue()); 374 last_synced_time_.ToInternalValue());
374 profile_->GetPrefs()->ScheduleSavePersistentPrefs(); 375 profile_->GetPrefs()->ScheduleSavePersistentPrefs();
375 } 376 }
376 377
377 // static 378 // static
378 const wchar_t* ProfileSyncService::GetPrefNameForDataType( 379 const wchar_t* ProfileSyncService::GetPrefNameForDataType(
379 syncable::ModelType data_type) { 380 syncable::ModelType data_type) {
380 switch (data_type) { 381 switch (data_type) {
381 case syncable::BOOKMARKS: 382 case syncable::BOOKMARKS:
382 return prefs::kSyncBookmarks; 383 return prefs::kSyncBookmarks;
384 case syncable::PASSWORD:
385 return prefs::kSyncPasswords;
383 case syncable::PREFERENCES: 386 case syncable::PREFERENCES:
384 return prefs::kSyncPreferences; 387 return prefs::kSyncPreferences;
385 case syncable::AUTOFILL: 388 case syncable::AUTOFILL:
386 return prefs::kSyncAutofill; 389 return prefs::kSyncAutofill;
387 case syncable::THEMES: 390 case syncable::THEMES:
388 return prefs::kSyncThemes; 391 return prefs::kSyncThemes;
389 case syncable::TYPED_URLS: 392 case syncable::TYPED_URLS:
390 return prefs::kSyncTypedUrls; 393 return prefs::kSyncTypedUrls;
391 default: 394 default:
392 NOTREACHED(); 395 NOTREACHED();
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 // is initialized, all enabled data types are consistent with one 713 // is initialized, all enabled data types are consistent with one
711 // another, and no unrecoverable error has transpired. 714 // another, and no unrecoverable error has transpired.
712 if (unrecoverable_error_detected_) 715 if (unrecoverable_error_detected_)
713 return false; 716 return false;
714 717
715 if (!data_type_manager_.get()) 718 if (!data_type_manager_.get())
716 return false; 719 return false;
717 720
718 return data_type_manager_->state() == DataTypeManager::CONFIGURED; 721 return data_type_manager_->state() == DataTypeManager::CONFIGURED;
719 } 722 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698