chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 15947007: Move application restart and relaunch code out of ExtensionService.

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

Issue 15947007: Move application restart and relaunch code out of ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pafooey Created 7 years, 6 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

« no previous file with comments | « chrome/browser/extensions/unpacked_installer.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

OLD	NEW
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_load_service_factory.h"

7 #include "apps/app_restore_service_factory.h"	8 #include "apps/app_restore_service_factory.h"

8 #include "apps/shell_window_geometry_cache.h"	9 #include "apps/shell_window_geometry_cache.h"

9 #include "apps/shortcut_manager_factory.h"	10 #include "apps/shortcut_manager_factory.h"

10 #include "chrome/browser/autofill/autocheckout_whitelist_manager_factory.h"	11 #include "chrome/browser/autofill/autocheckout_whitelist_manager_factory.h"

11 #include "chrome/browser/autofill/personal_data_manager_factory.h"	12 #include "chrome/browser/autofill/personal_data_manager_factory.h"

12 #include "chrome/browser/background/background_contents_service_factory.h"	13 #include "chrome/browser/background/background_contents_service_factory.h"

13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

14 #include "chrome/browser/chrome_browser_main.h"	15 #include "chrome/browser/chrome_browser_main.h"

15 #include "chrome/browser/content_settings/cookie_settings.h"	16 #include "chrome/browser/content_settings/cookie_settings.h"

16 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"	17 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

(...skipping 151 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
168 #endif	169 #endif

169 #if defined(ENABLE_PRINTING)	170 #if defined(ENABLE_PRINTING)

170 CloudPrintProxyServiceFactory::GetInstance();	171 CloudPrintProxyServiceFactory::GetInstance();

171 #endif	172 #endif

172 CookieSettings::Factory::GetInstance();	173 CookieSettings::Factory::GetInstance();

173 #if defined(ENABLE_NOTIFICATIONS)	174 #if defined(ENABLE_NOTIFICATIONS)

174 DesktopNotificationServiceFactory::GetInstance();	175 DesktopNotificationServiceFactory::GetInstance();

175 #endif	176 #endif

176 DownloadServiceFactory::GetInstance();	177 DownloadServiceFactory::GetInstance();

177 #if defined(ENABLE_EXTENSIONS)	178 #if defined(ENABLE_EXTENSIONS)

	179 apps::AppLoadServiceFactory::GetInstance();

178 apps::AppRestoreServiceFactory::GetInstance();	180 apps::AppRestoreServiceFactory::GetInstance();

179 apps::ShellWindowGeometryCache::Factory::GetInstance();	181 apps::ShellWindowGeometryCache::Factory::GetInstance();

180 apps::ShortcutManagerFactory::GetInstance();	182 apps::ShortcutManagerFactory::GetInstance();

181 autofill::autocheckout::WhitelistManagerFactory::GetInstance();	183 autofill::autocheckout::WhitelistManagerFactory::GetInstance();

182 extensions::ActivityLogFactory::GetInstance();	184 extensions::ActivityLogFactory::GetInstance();

183 extensions::AlarmManager::GetFactoryInstance();	185 extensions::AlarmManager::GetFactoryInstance();

184 extensions::AudioAPI::GetFactoryInstance();	186 extensions::AudioAPI::GetFactoryInstance();

185 extensions::BookmarksAPI::GetFactoryInstance();	187 extensions::BookmarksAPI::GetFactoryInstance();

186 extensions::BluetoothAPIFactory::GetInstance();	188 extensions::BluetoothAPIFactory::GetInstance();

187 extensions::CommandService::GetFactoryInstance();	189 extensions::CommandService::GetFactoryInstance();

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
285 TokenServiceFactory::GetInstance();	287 TokenServiceFactory::GetInstance();

286 #if !defined(OS_ANDROID)	288 #if !defined(OS_ANDROID)

287 UserStyleSheetWatcherFactory::GetInstance();	289 UserStyleSheetWatcherFactory::GetInstance();

288 #endif	290 #endif

289 WebDataServiceFactory::GetInstance();	291 WebDataServiceFactory::GetInstance();

290 }	292 }

291	293

292 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {	294 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {

293 EnsureBrowserContextKeyedServiceFactoriesBuilt();	295 EnsureBrowserContextKeyedServiceFactoriesBuilt();

294 }	296 }

OLD	NEW