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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 382113002: Only enable Hotwords when extensions are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" 7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
8 #include "chrome/browser/autofill/personal_data_manager_factory.h" 8 #include "chrome/browser/autofill/personal_data_manager_factory.h"
9 #include "chrome/browser/background/background_contents_service_factory.h" 9 #include "chrome/browser/background/background_contents_service_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 23 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
24 #include "chrome/browser/password_manager/password_store_factory.h" 24 #include "chrome/browser/password_manager/password_store_factory.h"
25 #include "chrome/browser/plugins/plugin_prefs_factory.h" 25 #include "chrome/browser/plugins/plugin_prefs_factory.h"
26 #include "chrome/browser/policy/profile_policy_connector_factory.h" 26 #include "chrome/browser/policy/profile_policy_connector_factory.h"
27 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" 27 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
28 #include "chrome/browser/predictors/predictor_database_factory.h" 28 #include "chrome/browser/predictors/predictor_database_factory.h"
29 #include "chrome/browser/prerender/prerender_link_manager_factory.h" 29 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
30 #include "chrome/browser/prerender/prerender_manager_factory.h" 30 #include "chrome/browser/prerender/prerender_manager_factory.h"
31 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 31 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
32 #include "chrome/browser/profiles/gaia_info_update_service_factory.h" 32 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
33 #include "chrome/browser/search/hotword_service_factory.h"
34 #include "chrome/browser/search/instant_service_factory.h" 33 #include "chrome/browser/search/instant_service_factory.h"
35 #include "chrome/browser/search/suggestions/suggestions_service_factory.h" 34 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
36 #include "chrome/browser/search_engines/template_url_fetcher_factory.h" 35 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
37 #include "chrome/browser/search_engines/template_url_service_factory.h" 36 #include "chrome/browser/search_engines/template_url_service_factory.h"
38 #include "chrome/browser/sessions/session_service_factory.h" 37 #include "chrome/browser/sessions/session_service_factory.h"
39 #include "chrome/browser/sessions/tab_restore_service_factory.h" 38 #include "chrome/browser/sessions/tab_restore_service_factory.h"
40 #include "chrome/browser/signin/about_signin_internals_factory.h" 39 #include "chrome/browser/signin/about_signin_internals_factory.h"
41 #include "chrome/browser/signin/signin_manager_factory.h" 40 #include "chrome/browser/signin/signin_manager_factory.h"
42 #include "chrome/browser/sync/profile_sync_service_factory.h" 41 #include "chrome/browser/sync/profile_sync_service_factory.h"
43 #include "chrome/browser/themes/theme_service_factory.h" 42 #include "chrome/browser/themes/theme_service_factory.h"
44 #include "chrome/browser/thumbnails/thumbnail_service_factory.h" 43 #include "chrome/browser/thumbnails/thumbnail_service_factory.h"
45 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" 44 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
46 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" 45 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
47 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 46 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
48 #include "chrome/browser/ui/tabs/pinned_tab_service_factory.h" 47 #include "chrome/browser/ui/tabs/pinned_tab_service_factory.h"
49 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" 48 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
50 #include "chrome/browser/undo/bookmark_undo_service_factory.h" 49 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
51 #include "chrome/browser/webdata/web_data_service_factory.h" 50 #include "chrome/browser/webdata/web_data_service_factory.h"
52 51
53 #if defined(ENABLE_EXTENSIONS) 52 #if defined(ENABLE_EXTENSIONS)
54 #include "apps/browser_context_keyed_service_factories.h" 53 #include "apps/browser_context_keyed_service_factories.h"
55 #include "chrome/browser/apps/ephemeral_app_service_factory.h" 54 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
56 #include "chrome/browser/apps/shortcut_manager_factory.h" 55 #include "chrome/browser/apps/shortcut_manager_factory.h"
57 #include "chrome/browser/extensions/browser_context_keyed_service_factories.h" 56 #include "chrome/browser/extensions/browser_context_keyed_service_factories.h"
57 #include "chrome/browser/search/hotword_service_factory.h"
58 #include "extensions/browser/browser_context_keyed_service_factories.h" 58 #include "extensions/browser/browser_context_keyed_service_factories.h"
59 #endif 59 #endif
60 60
61 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 61 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
62 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 62 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
63 #endif 63 #endif
64 64
65 #if defined(ENABLE_CONFIGURATION_POLICY) 65 #if defined(ENABLE_CONFIGURATION_POLICY)
66 #include "chrome/browser/policy/cloud/policy_header_service_factory.h" 66 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
67 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" 67 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 DownloadServiceFactory::GetInstance(); 179 DownloadServiceFactory::GetInstance();
180 FaviconServiceFactory::GetInstance(); 180 FaviconServiceFactory::GetInstance();
181 FindBarStateFactory::GetInstance(); 181 FindBarStateFactory::GetInstance();
182 GAIAInfoUpdateServiceFactory::GetInstance(); 182 GAIAInfoUpdateServiceFactory::GetInstance();
183 #if defined(USE_AURA) 183 #if defined(USE_AURA)
184 GesturePrefsObserverFactoryAura::GetInstance(); 184 GesturePrefsObserverFactoryAura::GetInstance();
185 #endif 185 #endif
186 GlobalErrorServiceFactory::GetInstance(); 186 GlobalErrorServiceFactory::GetInstance();
187 GoogleURLTrackerFactory::GetInstance(); 187 GoogleURLTrackerFactory::GetInstance();
188 HistoryServiceFactory::GetInstance(); 188 HistoryServiceFactory::GetInstance();
189 #if defined(ENABLE_EXTENSIONS)
189 HotwordServiceFactory::GetInstance(); 190 HotwordServiceFactory::GetInstance();
191 #endif
190 invalidation::ProfileInvalidationProviderFactory::GetInstance(); 192 invalidation::ProfileInvalidationProviderFactory::GetInstance();
191 InstantServiceFactory::GetInstance(); 193 InstantServiceFactory::GetInstance();
192 #if defined(ENABLE_SERVICE_DISCOVERY) 194 #if defined(ENABLE_SERVICE_DISCOVERY)
193 local_discovery::PrivetNotificationServiceFactory::GetInstance(); 195 local_discovery::PrivetNotificationServiceFactory::GetInstance();
194 #endif 196 #endif
195 #if defined(ENABLE_MANAGED_USERS) 197 #if defined(ENABLE_MANAGED_USERS)
196 #if defined(OS_CHROMEOS) 198 #if defined(OS_CHROMEOS)
197 chromeos::SupervisedUserPasswordServiceFactory::GetInstance(); 199 chromeos::SupervisedUserPasswordServiceFactory::GetInstance();
198 chromeos::ManagerPasswordServiceFactory::GetInstance(); 200 chromeos::ManagerPasswordServiceFactory::GetInstance();
199 #endif 201 #endif
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 TemplateURLServiceFactory::GetInstance(); 254 TemplateURLServiceFactory::GetInstance();
253 #if defined(ENABLE_THEMES) 255 #if defined(ENABLE_THEMES)
254 ThemeServiceFactory::GetInstance(); 256 ThemeServiceFactory::GetInstance();
255 #endif 257 #endif
256 WebDataServiceFactory::GetInstance(); 258 WebDataServiceFactory::GetInstance();
257 } 259 }
258 260
259 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 261 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
260 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 262 EnsureBrowserContextKeyedServiceFactoriesBuilt();
261 } 263 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/external_component_loader.cc ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698