OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 case syncable::BOOKMARKS: | 550 case syncable::BOOKMARKS: |
551 return prefs::kSyncBookmarks; | 551 return prefs::kSyncBookmarks; |
552 case syncable::PASSWORDS: | 552 case syncable::PASSWORDS: |
553 return prefs::kSyncPasswords; | 553 return prefs::kSyncPasswords; |
554 case syncable::PREFERENCES: | 554 case syncable::PREFERENCES: |
555 return prefs::kSyncPreferences; | 555 return prefs::kSyncPreferences; |
556 case syncable::AUTOFILL: | 556 case syncable::AUTOFILL: |
557 return prefs::kSyncAutofill; | 557 return prefs::kSyncAutofill; |
558 case syncable::AUTOFILL_PROFILE: | 558 case syncable::AUTOFILL_PROFILE: |
559 return prefs::kSyncAutofillProfile; | 559 return prefs::kSyncAutofillProfile; |
560 break; | |
561 case syncable::THEMES: | 560 case syncable::THEMES: |
562 return prefs::kSyncThemes; | 561 return prefs::kSyncThemes; |
563 case syncable::TYPED_URLS: | 562 case syncable::TYPED_URLS: |
564 return prefs::kSyncTypedUrls; | 563 return prefs::kSyncTypedUrls; |
565 case syncable::EXTENSIONS: | 564 case syncable::EXTENSIONS: |
566 return prefs::kSyncExtensions; | 565 return prefs::kSyncExtensions; |
567 case syncable::APPS: | 566 case syncable::APPS: |
568 return prefs::kSyncApps; | 567 return prefs::kSyncApps; |
569 case syncable::SESSIONS: | 568 case syncable::SESSIONS: |
570 return prefs::kSyncSessions; | 569 return prefs::kSyncSessions; |
571 default: | 570 default: |
572 NOTREACHED(); | 571 break; |
573 return NULL; | |
574 } | 572 } |
| 573 NOTREACHED(); |
| 574 return NULL; |
575 } | 575 } |
576 | 576 |
577 // An invariant has been violated. Transition to an error state where we try | 577 // An invariant has been violated. Transition to an error state where we try |
578 // to do as little work as possible, to avoid further corruption or crashes. | 578 // to do as little work as possible, to avoid further corruption or crashes. |
579 void ProfileSyncService::OnUnrecoverableError( | 579 void ProfileSyncService::OnUnrecoverableError( |
580 const tracked_objects::Location& from_here, | 580 const tracked_objects::Location& from_here, |
581 const std::string& message) { | 581 const std::string& message) { |
582 unrecoverable_error_detected_ = true; | 582 unrecoverable_error_detected_ = true; |
583 unrecoverable_error_message_ = message; | 583 unrecoverable_error_message_ = message; |
584 unrecoverable_error_location_.reset( | 584 unrecoverable_error_location_.reset( |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1216 // is initialized, all enabled data types are consistent with one | 1216 // is initialized, all enabled data types are consistent with one |
1217 // another, and no unrecoverable error has transpired. | 1217 // another, and no unrecoverable error has transpired. |
1218 if (unrecoverable_error_detected_) | 1218 if (unrecoverable_error_detected_) |
1219 return false; | 1219 return false; |
1220 | 1220 |
1221 if (!data_type_manager_.get()) | 1221 if (!data_type_manager_.get()) |
1222 return false; | 1222 return false; |
1223 | 1223 |
1224 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 1224 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
1225 } | 1225 } |
OLD | NEW |