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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 case syncable::BOOKMARKS: | 547 case syncable::BOOKMARKS: |
548 return prefs::kSyncBookmarks; | 548 return prefs::kSyncBookmarks; |
549 case syncable::PASSWORDS: | 549 case syncable::PASSWORDS: |
550 return prefs::kSyncPasswords; | 550 return prefs::kSyncPasswords; |
551 case syncable::PREFERENCES: | 551 case syncable::PREFERENCES: |
552 return prefs::kSyncPreferences; | 552 return prefs::kSyncPreferences; |
553 case syncable::AUTOFILL: | 553 case syncable::AUTOFILL: |
554 return prefs::kSyncAutofill; | 554 return prefs::kSyncAutofill; |
555 case syncable::AUTOFILL_PROFILE: | 555 case syncable::AUTOFILL_PROFILE: |
556 return prefs::kSyncAutofillProfile; | 556 return prefs::kSyncAutofillProfile; |
557 break; | |
558 case syncable::THEMES: | 557 case syncable::THEMES: |
559 return prefs::kSyncThemes; | 558 return prefs::kSyncThemes; |
560 case syncable::TYPED_URLS: | 559 case syncable::TYPED_URLS: |
561 return prefs::kSyncTypedUrls; | 560 return prefs::kSyncTypedUrls; |
562 case syncable::EXTENSIONS: | 561 case syncable::EXTENSIONS: |
563 return prefs::kSyncExtensions; | 562 return prefs::kSyncExtensions; |
564 case syncable::APPS: | 563 case syncable::APPS: |
565 return prefs::kSyncApps; | 564 return prefs::kSyncApps; |
566 case syncable::SESSIONS: | 565 case syncable::SESSIONS: |
567 return prefs::kSyncSessions; | 566 return prefs::kSyncSessions; |
568 default: | 567 default: |
569 NOTREACHED(); | 568 break; |
570 return NULL; | |
571 } | 569 } |
| 570 NOTREACHED(); |
| 571 return NULL; |
572 } | 572 } |
573 | 573 |
574 // An invariant has been violated. Transition to an error state where we try | 574 // An invariant has been violated. Transition to an error state where we try |
575 // to do as little work as possible, to avoid further corruption or crashes. | 575 // to do as little work as possible, to avoid further corruption or crashes. |
576 void ProfileSyncService::OnUnrecoverableError( | 576 void ProfileSyncService::OnUnrecoverableError( |
577 const tracked_objects::Location& from_here, | 577 const tracked_objects::Location& from_here, |
578 const std::string& message) { | 578 const std::string& message) { |
579 unrecoverable_error_detected_ = true; | 579 unrecoverable_error_detected_ = true; |
580 unrecoverable_error_message_ = message; | 580 unrecoverable_error_message_ = message; |
581 unrecoverable_error_location_.reset( | 581 unrecoverable_error_location_.reset( |
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1171 // is initialized, all enabled data types are consistent with one | 1171 // is initialized, all enabled data types are consistent with one |
1172 // another, and no unrecoverable error has transpired. | 1172 // another, and no unrecoverable error has transpired. |
1173 if (unrecoverable_error_detected_) | 1173 if (unrecoverable_error_detected_) |
1174 return false; | 1174 return false; |
1175 | 1175 |
1176 if (!data_type_manager_.get()) | 1176 if (!data_type_manager_.get()) |
1177 return false; | 1177 return false; |
1178 | 1178 |
1179 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 1179 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
1180 } | 1180 } |
OLD | NEW |