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 11 matching lines...) Expand all Loading... |
22 #include "base/strings/stringprintf.h" | 22 #include "base/strings/stringprintf.h" |
23 #include "base/threading/thread_restrictions.h" | 23 #include "base/threading/thread_restrictions.h" |
24 #include "build/build_config.h" | 24 #include "build/build_config.h" |
25 #include "chrome/browser/browser_process.h" | 25 #include "chrome/browser/browser_process.h" |
26 #include "chrome/browser/chrome_notification_types.h" | 26 #include "chrome/browser/chrome_notification_types.h" |
27 #include "chrome/browser/defaults.h" | 27 #include "chrome/browser/defaults.h" |
28 #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" | 28 #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" |
29 #include "chrome/browser/net/chrome_cookie_notification_details.h" | 29 #include "chrome/browser/net/chrome_cookie_notification_details.h" |
30 #include "chrome/browser/prefs/pref_service_syncable.h" | 30 #include "chrome/browser/prefs/pref_service_syncable.h" |
31 #include "chrome/browser/profiles/profile.h" | 31 #include "chrome/browser/profiles/profile.h" |
| 32 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
32 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" | 33 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" |
33 #include "chrome/browser/signin/about_signin_internals.h" | 34 #include "chrome/browser/signin/about_signin_internals.h" |
34 #include "chrome/browser/signin/about_signin_internals_factory.h" | 35 #include "chrome/browser/signin/about_signin_internals_factory.h" |
35 #include "chrome/browser/signin/profile_oauth2_token_service.h" | 36 #include "chrome/browser/signin/profile_oauth2_token_service.h" |
36 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 37 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
37 #include "chrome/browser/signin/signin_manager.h" | 38 #include "chrome/browser/signin/signin_manager.h" |
38 #include "chrome/browser/signin/signin_manager_factory.h" | 39 #include "chrome/browser/signin/signin_manager_factory.h" |
39 #include "chrome/browser/sync/backend_migrator.h" | 40 #include "chrome/browser/sync/backend_migrator.h" |
40 #include "chrome/browser/sync/glue/change_processor.h" | 41 #include "chrome/browser/sync/glue/change_processor.h" |
41 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" | 42 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" |
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
988 if (current_experiments_.Matches(experiments)) | 989 if (current_experiments_.Matches(experiments)) |
989 return; | 990 return; |
990 | 991 |
991 current_experiments_ = experiments; | 992 current_experiments_ = experiments; |
992 | 993 |
993 // Handle preference-backed experiments first. | 994 // Handle preference-backed experiments first. |
994 if (experiments.gcm_channel_state != syncer::Experiments::UNSET) { | 995 if (experiments.gcm_channel_state != syncer::Experiments::UNSET) { |
995 profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, | 996 profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, |
996 experiments.gcm_channel_state == | 997 experiments.gcm_channel_state == |
997 syncer::Experiments::ENABLED); | 998 syncer::Experiments::ENABLED); |
998 gcm::GCMProfileServiceFactory::GetForProfile(profile()); | 999 gcm::GCMProfileService* gcm_profile_service = |
| 1000 gcm::GCMProfileServiceFactory::GetForProfile(profile()); |
| 1001 if (gcm_profile_service) { |
| 1002 if (experiments.gcm_channel_state == syncer::Experiments::SUPPRESSED) |
| 1003 gcm_profile_service->Stop(); |
| 1004 else |
| 1005 gcm_profile_service->Start(); |
| 1006 } |
999 } else { | 1007 } else { |
1000 profile()->GetPrefs()->ClearPref(prefs::kGCMChannelEnabled); | 1008 profile()->GetPrefs()->ClearPref(prefs::kGCMChannelEnabled); |
1001 } | 1009 } |
1002 | 1010 |
1003 if (experiments.enhanced_bookmarks_enabled) { | 1011 if (experiments.enhanced_bookmarks_enabled) { |
1004 profile_->GetPrefs()->SetBoolean(prefs::kEnhancedBookmarksExperimentEnabled, | 1012 profile_->GetPrefs()->SetBoolean(prefs::kEnhancedBookmarksExperimentEnabled, |
1005 true); | 1013 true); |
1006 profile_->GetPrefs()->SetString(prefs::kEnhancedBookmarksExtensionId, | 1014 profile_->GetPrefs()->SetString(prefs::kEnhancedBookmarksExtensionId, |
1007 experiments.enhanced_bookmarks_ext_id); | 1015 experiments.enhanced_bookmarks_ext_id); |
1008 } | 1016 } |
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2161 status.last_get_token_error = last_get_token_error_; | 2169 status.last_get_token_error = last_get_token_error_; |
2162 if (request_access_token_retry_timer_.IsRunning()) | 2170 if (request_access_token_retry_timer_.IsRunning()) |
2163 status.next_token_request_time = next_token_request_time_; | 2171 status.next_token_request_time = next_token_request_time_; |
2164 return status; | 2172 return status; |
2165 } | 2173 } |
2166 | 2174 |
2167 void ProfileSyncService::OverrideNetworkResourcesForTest( | 2175 void ProfileSyncService::OverrideNetworkResourcesForTest( |
2168 scoped_ptr<syncer::NetworkResources> network_resources) { | 2176 scoped_ptr<syncer::NetworkResources> network_resources) { |
2169 network_resources_ = network_resources.Pass(); | 2177 network_resources_ = network_resources.Pass(); |
2170 } | 2178 } |
OLD | NEW |