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 966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
977 } | 977 } |
978 } | 978 } |
979 | 979 |
980 // Now enable any non-datatype features. | 980 // Now enable any non-datatype features. |
981 if (experiments.keystore_encryption) { | 981 if (experiments.keystore_encryption) { |
982 about_flags::SetExperimentEnabled(g_browser_process->local_state(), | 982 about_flags::SetExperimentEnabled(g_browser_process->local_state(), |
983 syncer::kKeystoreEncryptionFlag, | 983 syncer::kKeystoreEncryptionFlag, |
984 true); | 984 true); |
985 } | 985 } |
986 | 986 |
987 if (experiments.full_history_sync) { | |
988 about_flags::SetExperimentEnabled(g_browser_process->local_state(), | |
989 syncer::kFullHistorySyncFlag, | |
990 true); | |
991 } | |
992 | |
993 if (experiments.favicon_sync) { | 987 if (experiments.favicon_sync) { |
994 about_flags::SetExperimentEnabled(g_browser_process->local_state(), | 988 about_flags::SetExperimentEnabled(g_browser_process->local_state(), |
995 syncer::kFaviconSyncFlag, | 989 syncer::kFaviconSyncFlag, |
996 true); | 990 true); |
997 } | 991 } |
998 | 992 |
999 current_experiments_ = experiments; | 993 current_experiments_ = experiments; |
1000 } | 994 } |
1001 | 995 |
1002 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) { | 996 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) { |
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2064 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 2058 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
2065 ProfileSyncService* old_this = this; | 2059 ProfileSyncService* old_this = this; |
2066 this->~ProfileSyncService(); | 2060 this->~ProfileSyncService(); |
2067 new(old_this) ProfileSyncService( | 2061 new(old_this) ProfileSyncService( |
2068 new ProfileSyncComponentsFactoryImpl(profile, | 2062 new ProfileSyncComponentsFactoryImpl(profile, |
2069 CommandLine::ForCurrentProcess()), | 2063 CommandLine::ForCurrentProcess()), |
2070 profile, | 2064 profile, |
2071 signin, | 2065 signin, |
2072 behavior); | 2066 behavior); |
2073 } | 2067 } |
OLD | NEW |