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

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

Issue 48853005: Remove ExtensionToolbarModel from ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile after rebase Created 7 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 | 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 "apps/app_keep_alive_service_factory.h" 7 #include "apps/app_keep_alive_service_factory.h"
8 #include "apps/app_load_service_factory.h" 8 #include "apps/app_load_service_factory.h"
9 #include "apps/app_restore_service_factory.h" 9 #include "apps/app_restore_service_factory.h"
10 #include "apps/shell_window_geometry_cache.h" 10 #include "apps/shell_window_geometry_cache.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #include "chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher. h" 96 #include "chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher. h"
97 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" 97 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
98 #include "chrome/browser/extensions/api/system_info/system_info_api.h" 98 #include "chrome/browser/extensions/api/system_info/system_info_api.h"
99 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" 99 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
100 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" 100 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
101 #include "chrome/browser/extensions/api/usb/usb_device_resource.h" 101 #include "chrome/browser/extensions/api/usb/usb_device_resource.h"
102 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 102 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
103 #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_privat e_api.h" 103 #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_privat e_api.h"
104 #include "chrome/browser/extensions/extension_prefs_factory.h" 104 #include "chrome/browser/extensions/extension_prefs_factory.h"
105 #include "chrome/browser/extensions/extension_system_factory.h" 105 #include "chrome/browser/extensions/extension_system_factory.h"
106 #include "chrome/browser/extensions/extension_toolbar_model_factory.h"
106 #include "chrome/browser/extensions/extension_web_ui_override_registrar.h" 107 #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
107 #include "chrome/browser/extensions/install_tracker_factory.h" 108 #include "chrome/browser/extensions/install_tracker_factory.h"
108 #include "chrome/browser/extensions/plugin_manager.h" 109 #include "chrome/browser/extensions/plugin_manager.h"
109 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" 110 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
110 #endif // defined(ENABLE_EXTENSIONS) 111 #endif // defined(ENABLE_EXTENSIONS)
111 112
112 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 113 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
113 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 114 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
114 #endif 115 #endif
115 116
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 extensions::SpellcheckAPI::GetFactoryInstance(); 286 extensions::SpellcheckAPI::GetFactoryInstance();
286 #endif 287 #endif
287 extensions::StreamsPrivateAPI::GetFactoryInstance(); 288 extensions::StreamsPrivateAPI::GetFactoryInstance();
288 extensions::SystemInfoAPI::GetFactoryInstance(); 289 extensions::SystemInfoAPI::GetFactoryInstance();
289 extensions::SuggestedLinksRegistryFactory::GetInstance(); 290 extensions::SuggestedLinksRegistryFactory::GetInstance();
290 extensions::TabCaptureRegistry::GetFactoryInstance(); 291 extensions::TabCaptureRegistry::GetFactoryInstance();
291 extensions::TabsWindowsAPI::GetFactoryInstance(); 292 extensions::TabsWindowsAPI::GetFactoryInstance();
292 extensions::TtsAPI::GetFactoryInstance(); 293 extensions::TtsAPI::GetFactoryInstance();
293 extensions::WebNavigationAPI::GetFactoryInstance(); 294 extensions::WebNavigationAPI::GetFactoryInstance();
294 extensions::WebrtcAudioPrivateEventService::GetFactoryInstance(); 295 extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
296 ExtensionToolbarModelFactory::GetInstance();
295 #endif // defined(ENABLE_EXTENSIONS) 297 #endif // defined(ENABLE_EXTENSIONS)
296 FaviconServiceFactory::GetInstance(); 298 FaviconServiceFactory::GetInstance();
297 #if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION) 299 #if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION)
298 file_manager::FileBrowserPrivateAPIFactory::GetInstance(); 300 file_manager::FileBrowserPrivateAPIFactory::GetInstance();
299 #endif 301 #endif
300 FindBarStateFactory::GetInstance(); 302 FindBarStateFactory::GetInstance();
301 GAIAInfoUpdateServiceFactory::GetInstance(); 303 GAIAInfoUpdateServiceFactory::GetInstance();
302 #if defined(USE_AURA) 304 #if defined(USE_AURA)
303 GesturePrefsObserverFactoryAura::GetInstance(); 305 GesturePrefsObserverFactoryAura::GetInstance();
304 #endif 306 #endif
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 TokenServiceFactory::GetInstance(); 369 TokenServiceFactory::GetInstance();
368 #if !defined(OS_ANDROID) 370 #if !defined(OS_ANDROID)
369 UserStyleSheetWatcherFactory::GetInstance(); 371 UserStyleSheetWatcherFactory::GetInstance();
370 #endif 372 #endif
371 WebDataServiceFactory::GetInstance(); 373 WebDataServiceFactory::GetInstance();
372 } 374 }
373 375
374 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 376 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
375 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 377 EnsureBrowserContextKeyedServiceFactoriesBuilt();
376 } 378 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698