| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/invalidation/invalidation_service_factory.h" | 5 #include "chrome/browser/invalidation/invalidation_service_factory.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_registry.h" | 7 #include "base/prefs/pref_registry.h" |
| 8 #include "chrome/browser/invalidation/fake_invalidation_service.h" | 8 #include "chrome/browser/invalidation/fake_invalidation_service.h" |
| 9 #include "chrome/browser/invalidation/invalidation_service.h" | 9 #include "chrome/browser/invalidation/invalidation_service.h" |
| 10 #include "chrome/browser/invalidation/invalidation_service_android.h" | 10 #include "chrome/browser/invalidation/invalidation_service_android.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 TiclInvalidationService* service = new TiclInvalidationService( | 98 TiclInvalidationService* service = new TiclInvalidationService( |
| 99 signin_manager, | 99 signin_manager, |
| 100 token_service, | 100 token_service, |
| 101 oauth2_token_service, | 101 oauth2_token_service, |
| 102 profile); | 102 profile); |
| 103 service->Init(); | 103 service->Init(); |
| 104 return service; | 104 return service; |
| 105 #endif | 105 #endif |
| 106 } | 106 } |
| 107 | 107 |
| 108 void InvalidationServiceFactory::RegisterUserPrefs( | 108 void InvalidationServiceFactory::RegisterProfilePrefs( |
| 109 user_prefs::PrefRegistrySyncable* registry) { | 109 user_prefs::PrefRegistrySyncable* registry) { |
| 110 InvalidatorStorage::RegisterUserPrefs(registry); | 110 InvalidatorStorage::RegisterProfilePrefs(registry); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace invalidation | 113 } // namespace invalidation |
| OLD | NEW |