| 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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSyncTabFavicons); | 924 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSyncTabFavicons); |
| 925 #endif | 925 #endif |
| 926 } | 926 } |
| 927 | 927 |
| 928 if (experiments.keystore_encryption) { | 928 if (experiments.keystore_encryption) { |
| 929 about_flags::SetExperimentEnabled(g_browser_process->local_state(), | 929 about_flags::SetExperimentEnabled(g_browser_process->local_state(), |
| 930 syncer::kKeystoreEncryptionFlag, | 930 syncer::kKeystoreEncryptionFlag, |
| 931 true); | 931 true); |
| 932 } | 932 } |
| 933 | 933 |
| 934 if (experiments.full_history_sync) { |
| 935 about_flags::SetExperimentEnabled(g_browser_process->local_state(), |
| 936 syncer::kFullHistorySyncFlag, |
| 937 true); |
| 938 } |
| 939 |
| 934 current_experiments_ = experiments; | 940 current_experiments_ = experiments; |
| 935 } | 941 } |
| 936 | 942 |
| 937 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) { | 943 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) { |
| 938 is_auth_in_progress_ = false; | 944 is_auth_in_progress_ = false; |
| 939 last_auth_error_ = error; | 945 last_auth_error_ = error; |
| 940 | 946 |
| 941 // Fan the notification out to interested UI-thread components. | 947 // Fan the notification out to interested UI-thread components. |
| 942 NotifyObservers(); | 948 NotifyObservers(); |
| 943 if (signin()) | 949 if (signin()) |
| (...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1960 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 1966 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
| 1961 ProfileSyncService* old_this = this; | 1967 ProfileSyncService* old_this = this; |
| 1962 this->~ProfileSyncService(); | 1968 this->~ProfileSyncService(); |
| 1963 new(old_this) ProfileSyncService( | 1969 new(old_this) ProfileSyncService( |
| 1964 new ProfileSyncComponentsFactoryImpl(profile, | 1970 new ProfileSyncComponentsFactoryImpl(profile, |
| 1965 CommandLine::ForCurrentProcess()), | 1971 CommandLine::ForCurrentProcess()), |
| 1966 profile, | 1972 profile, |
| 1967 signin, | 1973 signin, |
| 1968 behavior); | 1974 behavior); |
| 1969 } | 1975 } |
| OLD | NEW |