Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

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

Issue 2784353002: Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Fix tests Created 3 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/profile_invalidation_provider_factory.h" 5 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 15 matching lines...) Expand all
26 #include "components/invalidation/public/invalidation_service.h" 26 #include "components/invalidation/public/invalidation_service.h"
27 #include "components/keyed_service/content/browser_context_dependency_manager.h" 27 #include "components/keyed_service/content/browser_context_dependency_manager.h"
28 #include "components/pref_registry/pref_registry_syncable.h" 28 #include "components/pref_registry/pref_registry_syncable.h"
29 #include "components/prefs/pref_registry.h" 29 #include "components/prefs/pref_registry.h"
30 #include "components/signin/core/browser/profile_identity_provider.h" 30 #include "components/signin/core/browser/profile_identity_provider.h"
31 #include "components/signin/core/browser/profile_oauth2_token_service.h" 31 #include "components/signin/core/browser/profile_oauth2_token_service.h"
32 #include "components/signin/core/browser/signin_manager.h" 32 #include "components/signin/core/browser/signin_manager.h"
33 #include "net/url_request/url_request_context_getter.h" 33 #include "net/url_request/url_request_context_getter.h"
34 34
35 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
36 #include "base/android/context_utils.h"
37 #include "components/invalidation/impl/invalidation_service_android.h" 36 #include "components/invalidation/impl/invalidation_service_android.h"
38 #endif // defined(OS_ANDROID) 37 #endif // defined(OS_ANDROID)
39 38
40 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
41 #include "base/files/file_path.h" 40 #include "base/files/file_path.h"
42 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 41 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
43 #include "chrome/browser/chromeos/profiles/profile_helper.h" 42 #include "chrome/browser/chromeos/profiles/profile_helper.h"
44 #include "chrome/browser/chromeos/settings/device_identity_provider.h" 43 #include "chrome/browser/chromeos/settings/device_identity_provider.h"
45 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 44 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
46 #include "components/user_manager/user_manager.h" 45 #include "components/user_manager/user_manager.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 TestingFactoryFunction testing_factory) { 93 TestingFactoryFunction testing_factory) {
95 testing_factory_ = testing_factory; 94 testing_factory_ = testing_factory;
96 } 95 }
97 96
98 KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor( 97 KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
99 content::BrowserContext* context) const { 98 content::BrowserContext* context) const {
100 if (testing_factory_) 99 if (testing_factory_)
101 return testing_factory_(context).release(); 100 return testing_factory_(context).release();
102 101
103 #if defined(OS_ANDROID) 102 #if defined(OS_ANDROID)
104 return new ProfileInvalidationProvider(std::unique_ptr<InvalidationService>( 103 return new ProfileInvalidationProvider(
105 new InvalidationServiceAndroid(base::android::GetApplicationContext()))); 104 std::unique_ptr<InvalidationService>(new InvalidationServiceAndroid()));
106 #else 105 #else
107 106
108 std::unique_ptr<IdentityProvider> identity_provider; 107 std::unique_ptr<IdentityProvider> identity_provider;
109 108
110 #if defined(OS_CHROMEOS) 109 #if defined(OS_CHROMEOS)
111 policy::BrowserPolicyConnectorChromeOS* connector = 110 policy::BrowserPolicyConnectorChromeOS* connector =
112 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 111 g_browser_process->platform_part()->browser_policy_connector_chromeos();
113 if (user_manager::UserManager::IsInitialized() && 112 if (user_manager::UserManager::IsInitialized() &&
114 user_manager::UserManager::Get()->IsLoggedInAsKioskApp() && 113 user_manager::UserManager::Get()->IsLoggedInAsKioskApp() &&
115 connector->IsEnterpriseManaged()) { 114 connector->IsEnterpriseManaged()) {
(...skipping 23 matching lines...) Expand all
139 #endif 138 #endif
140 } 139 }
141 140
142 void ProfileInvalidationProviderFactory::RegisterProfilePrefs( 141 void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
143 user_prefs::PrefRegistrySyncable* registry) { 142 user_prefs::PrefRegistrySyncable* registry) {
144 ProfileInvalidationProvider::RegisterProfilePrefs(registry); 143 ProfileInvalidationProvider::RegisterProfilePrefs(registry);
145 InvalidatorStorage::RegisterProfilePrefs(registry); 144 InvalidatorStorage::RegisterProfilePrefs(registry);
146 } 145 }
147 146
148 } // namespace invalidation 147 } // namespace invalidation
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698