| OLD | NEW |
| 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/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 unrecoverable_error_reason_ = ERROR_REASON_UNSET; | 719 unrecoverable_error_reason_ = ERROR_REASON_UNSET; |
| 720 unrecoverable_error_message_.clear(); | 720 unrecoverable_error_message_.clear(); |
| 721 unrecoverable_error_location_ = tracked_objects::Location(); | 721 unrecoverable_error_location_ = tracked_objects::Location(); |
| 722 } | 722 } |
| 723 | 723 |
| 724 // static | 724 // static |
| 725 // TODO(sync): Consider having syncer::Experiments provide this. | 725 // TODO(sync): Consider having syncer::Experiments provide this. |
| 726 std::string ProfileSyncService::GetExperimentNameForDataType( | 726 std::string ProfileSyncService::GetExperimentNameForDataType( |
| 727 syncer::ModelType data_type) { | 727 syncer::ModelType data_type) { |
| 728 NOTREACHED(); | 728 NOTREACHED(); |
| 729 return ""; | 729 return std::string(); |
| 730 } | 730 } |
| 731 | 731 |
| 732 void ProfileSyncService::RegisterNewDataType(syncer::ModelType data_type) { | 732 void ProfileSyncService::RegisterNewDataType(syncer::ModelType data_type) { |
| 733 if (data_type_controllers_.count(data_type) > 0) | 733 if (data_type_controllers_.count(data_type) > 0) |
| 734 return; | 734 return; |
| 735 NOTREACHED(); | 735 NOTREACHED(); |
| 736 } | 736 } |
| 737 | 737 |
| 738 // An invariant has been violated. Transition to an error state where we try | 738 // An invariant has been violated. Transition to an error state where we try |
| 739 // to do as little work as possible, to avoid further corruption or crashes. | 739 // to do as little work as possible, to avoid further corruption or crashes. |
| (...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2028 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 2028 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
| 2029 ProfileSyncService* old_this = this; | 2029 ProfileSyncService* old_this = this; |
| 2030 this->~ProfileSyncService(); | 2030 this->~ProfileSyncService(); |
| 2031 new(old_this) ProfileSyncService( | 2031 new(old_this) ProfileSyncService( |
| 2032 new ProfileSyncComponentsFactoryImpl(profile, | 2032 new ProfileSyncComponentsFactoryImpl(profile, |
| 2033 CommandLine::ForCurrentProcess()), | 2033 CommandLine::ForCurrentProcess()), |
| 2034 profile, | 2034 profile, |
| 2035 signin, | 2035 signin, |
| 2036 behavior); | 2036 behavior); |
| 2037 } | 2037 } |
| OLD | NEW |