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

Side by Side Diff: chrome/browser/sync/profile_sync_service_factory.cc

Issue 395013002: Pass signin_scoped_device_id to DeviceInfoSpecifics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Revers chrome_signin_client Created 6 years, 5 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 (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_factory.h" 5 #include "chrome/browser/sync/profile_sync_service_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/autofill/personal_data_manager_factory.h" 10 #include "chrome/browser/autofill/personal_data_manager_factory.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "chrome/browser/defaults.h" 12 #include "chrome/browser/defaults.h"
13 #include "chrome/browser/history/history_service_factory.h" 13 #include "chrome/browser/history/history_service_factory.h"
14 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 14 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
15 #include "chrome/browser/password_manager/password_store_factory.h" 15 #include "chrome/browser/password_manager/password_store_factory.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/browser/search_engines/template_url_service_factory.h" 18 #include "chrome/browser/search_engines/template_url_service_factory.h"
19 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" 19 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
20 #include "chrome/browser/sessions/tab_restore_service_factory.h" 20 #include "chrome/browser/sessions/tab_restore_service_factory.h"
21 #include "chrome/browser/signin/about_signin_internals_factory.h" 21 #include "chrome/browser/signin/about_signin_internals_factory.h"
22 #include "chrome/browser/signin/chrome_signin_client_factory.h"
22 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
23 #include "chrome/browser/signin/signin_manager_factory.h" 24 #include "chrome/browser/signin/signin_manager_factory.h"
24 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" 25 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
25 #include "chrome/browser/sync/profile_sync_service.h" 26 #include "chrome/browser/sync/profile_sync_service.h"
26 #include "chrome/browser/sync/startup_controller.h" 27 #include "chrome/browser/sync/startup_controller.h"
27 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h" 28 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
28 #include "chrome/browser/themes/theme_service_factory.h" 29 #include "chrome/browser/themes/theme_service_factory.h"
29 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 30 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
30 #include "chrome/browser/webdata/web_data_service_factory.h" 31 #include "chrome/browser/webdata/web_data_service_factory.h"
31 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
(...skipping 26 matching lines...) Expand all
58 ProfileSyncServiceFactory::ProfileSyncServiceFactory() 59 ProfileSyncServiceFactory::ProfileSyncServiceFactory()
59 : BrowserContextKeyedServiceFactory( 60 : BrowserContextKeyedServiceFactory(
60 "ProfileSyncService", 61 "ProfileSyncService",
61 BrowserContextDependencyManager::GetInstance()) { 62 BrowserContextDependencyManager::GetInstance()) {
62 // The ProfileSyncService depends on various SyncableServices being around 63 // The ProfileSyncService depends on various SyncableServices being around
63 // when it is shut down. Specify those dependencies here to build the proper 64 // when it is shut down. Specify those dependencies here to build the proper
64 // destruction order. 65 // destruction order.
65 DependsOn(AboutSigninInternalsFactory::GetInstance()); 66 DependsOn(AboutSigninInternalsFactory::GetInstance());
66 DependsOn(autofill::PersonalDataManagerFactory::GetInstance()); 67 DependsOn(autofill::PersonalDataManagerFactory::GetInstance());
67 DependsOn(BookmarkModelFactory::GetInstance()); 68 DependsOn(BookmarkModelFactory::GetInstance());
69 DependsOn(ChromeSigninClientFactory::GetInstance());
68 DependsOn(GlobalErrorServiceFactory::GetInstance()); 70 DependsOn(GlobalErrorServiceFactory::GetInstance());
69 DependsOn(HistoryServiceFactory::GetInstance()); 71 DependsOn(HistoryServiceFactory::GetInstance());
70 DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance()); 72 DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
71 DependsOn(PasswordStoreFactory::GetInstance()); 73 DependsOn(PasswordStoreFactory::GetInstance());
72 DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance()); 74 DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
73 DependsOn(SigninManagerFactory::GetInstance()); 75 DependsOn(SigninManagerFactory::GetInstance());
74 DependsOn(TemplateURLServiceFactory::GetInstance()); 76 DependsOn(TemplateURLServiceFactory::GetInstance());
75 #if defined(ENABLE_THEMES) 77 #if defined(ENABLE_THEMES)
76 DependsOn(ThemeServiceFactory::GetInstance()); 78 DependsOn(ThemeServiceFactory::GetInstance());
77 #endif 79 #endif
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 145
144 pss->factory()->RegisterDataTypes(pss); 146 pss->factory()->RegisterDataTypes(pss);
145 pss->Initialize(); 147 pss->Initialize();
146 return pss; 148 return pss;
147 } 149 }
148 150
149 // static 151 // static
150 bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) { 152 bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) {
151 return GetInstance()->GetServiceForBrowserContext(profile, false) != NULL; 153 return GetInstance()->GetServiceForBrowserContext(profile, false) != NULL;
152 } 154 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698