| OLD | NEW |
| 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 last_synced_time_.ToInternalValue()); | 375 last_synced_time_.ToInternalValue()); |
| 376 profile_->GetPrefs()->ScheduleSavePersistentPrefs(); | 376 profile_->GetPrefs()->ScheduleSavePersistentPrefs(); |
| 377 } | 377 } |
| 378 | 378 |
| 379 // static | 379 // static |
| 380 const wchar_t* ProfileSyncService::GetPrefNameForDataType( | 380 const wchar_t* ProfileSyncService::GetPrefNameForDataType( |
| 381 syncable::ModelType data_type) { | 381 syncable::ModelType data_type) { |
| 382 switch (data_type) { | 382 switch (data_type) { |
| 383 case syncable::BOOKMARKS: | 383 case syncable::BOOKMARKS: |
| 384 return prefs::kSyncBookmarks; | 384 return prefs::kSyncBookmarks; |
| 385 case syncable::PASSWORD: | 385 case syncable::PASSWORDS: |
| 386 return prefs::kSyncPasswords; | 386 return prefs::kSyncPasswords; |
| 387 case syncable::PREFERENCES: | 387 case syncable::PREFERENCES: |
| 388 return prefs::kSyncPreferences; | 388 return prefs::kSyncPreferences; |
| 389 case syncable::AUTOFILL: | 389 case syncable::AUTOFILL: |
| 390 return prefs::kSyncAutofill; | 390 return prefs::kSyncAutofill; |
| 391 case syncable::THEMES: | 391 case syncable::THEMES: |
| 392 return prefs::kSyncThemes; | 392 return prefs::kSyncThemes; |
| 393 case syncable::TYPED_URLS: | 393 case syncable::TYPED_URLS: |
| 394 return prefs::kSyncTypedUrls; | 394 return prefs::kSyncTypedUrls; |
| 395 default: | 395 default: |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 // is initialized, all enabled data types are consistent with one | 716 // is initialized, all enabled data types are consistent with one |
| 717 // another, and no unrecoverable error has transpired. | 717 // another, and no unrecoverable error has transpired. |
| 718 if (unrecoverable_error_detected_) | 718 if (unrecoverable_error_detected_) |
| 719 return false; | 719 return false; |
| 720 | 720 |
| 721 if (!data_type_manager_.get()) | 721 if (!data_type_manager_.get()) |
| 722 return false; | 722 return false; |
| 723 | 723 |
| 724 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 724 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
| 725 } | 725 } |
| OLD | NEW |