chrome/browser/invalidation/invalidation_service_factory.cc - Issue 186623006: Refactor GCMNetworkChannelDelegateImpl

Side by Side Diff: chrome/browser/invalidation/invalidation_service_factory.cc

Issue 186623006: Refactor GCMNetworkChannelDelegateImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Another rebase to resolve conflict with recent change. Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/invalidation/gcm_network_channel_delegate_impl_unittest.cc ('k') | chrome/browser/invalidation/ticl_invalidation_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

11 #include "chrome/browser/invalidation/invalidator_storage.h"	11 #include "chrome/browser/invalidation/invalidator_storage.h"

12 #include "chrome/browser/invalidation/p2p_invalidation_service.h"	12 #include "chrome/browser/invalidation/p2p_invalidation_service.h"

13 #include "chrome/browser/invalidation/ticl_invalidation_service.h"	13 #include "chrome/browser/invalidation/ticl_invalidation_service.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

	15 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"

15 #include "chrome/browser/signin/profile_oauth2_token_service.h"	16 #include "chrome/browser/signin/profile_oauth2_token_service.h"

16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	17 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

17 #include "chrome/browser/signin/signin_manager.h"	18 #include "chrome/browser/signin/signin_manager.h"

18 #include "chrome/browser/signin/signin_manager_factory.h"	19 #include "chrome/browser/signin/signin_manager_factory.h"

19 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	20 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

20	21

21 #if defined(OS_ANDROID)	22 #if defined(OS_ANDROID)

22 #include "chrome/browser/invalidation/invalidation_controller_android.h"	23 #include "chrome/browser/invalidation/invalidation_controller_android.h"

23 #endif // defined(OS_ANDROID)	24 #endif // defined(OS_ANDROID)

24	25

(...skipping 12 matching lines...) Expand all Loading...
37 }	38 }

38	39

39 InvalidationServiceFactory::InvalidationServiceFactory()	40 InvalidationServiceFactory::InvalidationServiceFactory()

40 : BrowserContextKeyedServiceFactory(	41 : BrowserContextKeyedServiceFactory(

41 "InvalidationService",	42 "InvalidationService",

42 BrowserContextDependencyManager::GetInstance()),	43 BrowserContextDependencyManager::GetInstance()),

43 build_fake_invalidators_(false) {	44 build_fake_invalidators_(false) {

44 #if !defined(OS_ANDROID)	45 #if !defined(OS_ANDROID)

45 DependsOn(SigninManagerFactory::GetInstance());	46 DependsOn(SigninManagerFactory::GetInstance());

46 DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());	47 DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());

	48 DependsOn(gcm::GCMProfileServiceFactory::GetInstance());

47 #endif	49 #endif

48 }	50 }

49	51

50 InvalidationServiceFactory::~InvalidationServiceFactory() {}	52 InvalidationServiceFactory::~InvalidationServiceFactory() {}

51	53

52 namespace {	54 namespace {

53	55

54 BrowserContextKeyedService* BuildP2PInvalidationService(	56 BrowserContextKeyedService* BuildP2PInvalidationService(

55 content::BrowserContext* context) {	57 content::BrowserContext* context) {

56 Profile* profile = static_cast<Profile*>(context);	58 Profile* profile = static_cast<Profile*>(context);

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 return service;	106 return service;

105 #endif	107 #endif

106 }	108 }

107	109

108 void InvalidationServiceFactory::RegisterProfilePrefs(	110 void InvalidationServiceFactory::RegisterProfilePrefs(

109 user_prefs::PrefRegistrySyncable* registry) {	111 user_prefs::PrefRegistrySyncable* registry) {

110 InvalidatorStorage::RegisterProfilePrefs(registry);	112 InvalidatorStorage::RegisterProfilePrefs(registry);

111 }	113 }

112	114

113 } // namespace invalidation	115 } // namespace invalidation

OLD	NEW