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

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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 <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 23 matching lines...) Expand all
34 #include "components/browser_sync/profile_sync_components_factory_impl.h" 34 #include "components/browser_sync/profile_sync_components_factory_impl.h"
35 #include "components/browser_sync/profile_sync_service.h" 35 #include "components/browser_sync/profile_sync_service.h"
36 #include "components/keyed_service/content/browser_context_dependency_manager.h" 36 #include "components/keyed_service/content/browser_context_dependency_manager.h"
37 #include "components/network_time/network_time_tracker.h" 37 #include "components/network_time/network_time_tracker.h"
38 #include "components/signin/core/browser/profile_oauth2_token_service.h" 38 #include "components/signin/core/browser/profile_oauth2_token_service.h"
39 #include "components/signin/core/browser/signin_manager.h" 39 #include "components/signin/core/browser/signin_manager.h"
40 #include "components/sync/driver/signin_manager_wrapper.h" 40 #include "components/sync/driver/signin_manager_wrapper.h"
41 #include "components/sync/driver/startup_controller.h" 41 #include "components/sync/driver/startup_controller.h"
42 #include "components/sync/driver/sync_util.h" 42 #include "components/sync/driver/sync_util.h"
43 #include "content/public/browser/browser_thread.h" 43 #include "content/public/browser/browser_thread.h"
44 #include "extensions/features/features.h"
44 #include "url/gurl.h" 45 #include "url/gurl.h"
45 46
46 #if defined(ENABLE_EXTENSIONS) 47 #if BUILDFLAG(ENABLE_EXTENSIONS)
47 #include "extensions/browser/extension_system_provider.h" 48 #include "extensions/browser/extension_system_provider.h"
48 #include "extensions/browser/extensions_browser_client.h" 49 #include "extensions/browser/extensions_browser_client.h"
49 #endif 50 #endif
50 51
51 #if !defined(OS_ANDROID) 52 #if !defined(OS_ANDROID)
52 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 53 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
53 #endif 54 #endif
54 55
55 using browser_sync::ProfileSyncService; 56 using browser_sync::ProfileSyncService;
56 57
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 DependsOn(HistoryServiceFactory::GetInstance()); 115 DependsOn(HistoryServiceFactory::GetInstance());
115 DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance()); 116 DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
116 DependsOn(PasswordStoreFactory::GetInstance()); 117 DependsOn(PasswordStoreFactory::GetInstance());
117 DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance()); 118 DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
118 DependsOn(SigninManagerFactory::GetInstance()); 119 DependsOn(SigninManagerFactory::GetInstance());
119 DependsOn(TemplateURLServiceFactory::GetInstance()); 120 DependsOn(TemplateURLServiceFactory::GetInstance());
120 #if defined(ENABLE_THEMES) 121 #if defined(ENABLE_THEMES)
121 DependsOn(ThemeServiceFactory::GetInstance()); 122 DependsOn(ThemeServiceFactory::GetInstance());
122 #endif 123 #endif
123 DependsOn(WebDataServiceFactory::GetInstance()); 124 DependsOn(WebDataServiceFactory::GetInstance());
124 #if defined(ENABLE_EXTENSIONS) 125 #if BUILDFLAG(ENABLE_EXTENSIONS)
125 DependsOn( 126 DependsOn(
126 extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); 127 extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
127 #endif 128 #endif
128 129
129 // The following have not been converted to KeyedServices yet, 130 // The following have not been converted to KeyedServices yet,
130 // and for now they are explicitly destroyed after the 131 // and for now they are explicitly destroyed after the
131 // BrowserContextDependencyManager is told to DestroyBrowserContextServices, 132 // BrowserContextDependencyManager is told to DestroyBrowserContextServices,
132 // so they will be around when the ProfileSyncService is destroyed. 133 // so they will be around when the ProfileSyncService is destroyed.
133 134
134 // DependsOn(FaviconServiceFactory::GetInstance()); 135 // DependsOn(FaviconServiceFactory::GetInstance());
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 200
200 // static 201 // static
201 void ProfileSyncServiceFactory::SetSyncClientFactoryForTest( 202 void ProfileSyncServiceFactory::SetSyncClientFactoryForTest(
202 SyncClientFactory* client_factory) { 203 SyncClientFactory* client_factory) {
203 client_factory_ = client_factory; 204 client_factory_ = client_factory;
204 } 205 }
205 206
206 // static 207 // static
207 ProfileSyncServiceFactory::SyncClientFactory* 208 ProfileSyncServiceFactory::SyncClientFactory*
208 ProfileSyncServiceFactory::client_factory_ = nullptr; 209 ProfileSyncServiceFactory::client_factory_ = nullptr;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698