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

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

Issue 180163009: chrome.bluetooth API improvements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix threading ownership related to ApiResourceManager<BluetoothApiSocket> and BluetoothSocketEventD… Created 6 years, 9 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 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_load_service_factory.h"
8 #include "apps/app_restore_service_factory.h" 8 #include "apps/app_restore_service_factory.h"
9 #include "apps/app_window_geometry_cache.h" 9 #include "apps/app_window_geometry_cache.h"
10 #include "chrome/browser/apps/ephemeral_app_service_factory.h" 10 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" 51 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
52 #include "chrome/browser/undo/bookmark_undo_service_factory.h" 52 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
53 #include "chrome/browser/webdata/web_data_service_factory.h" 53 #include "chrome/browser/webdata/web_data_service_factory.h"
54 54
55 #if defined(ENABLE_EXTENSIONS) 55 #if defined(ENABLE_EXTENSIONS)
56 #include "chrome/browser/extensions/activity_log/activity_log.h" 56 #include "chrome/browser/extensions/activity_log/activity_log.h"
57 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h" 57 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h"
58 #include "chrome/browser/extensions/api/alarms/alarm_manager.h" 58 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
59 #include "chrome/browser/extensions/api/audio/audio_api.h" 59 #include "chrome/browser/extensions/api/audio/audio_api.h"
60 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h" 60 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
61 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_socket.h"
61 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" 62 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
62 #include "chrome/browser/extensions/api/braille_display_private/braille_display_ private_api.h" 63 #include "chrome/browser/extensions/api/braille_display_private/braille_display_ private_api.h"
63 #include "chrome/browser/extensions/api/commands/command_service.h" 64 #include "chrome/browser/extensions/api/commands/command_service.h"
64 #include "chrome/browser/extensions/api/cookies/cookies_api.h" 65 #include "chrome/browser/extensions/api/cookies/cookies_api.h"
65 #include "chrome/browser/extensions/api/developer_private/developer_private_api. h" 66 #include "chrome/browser/extensions/api/developer_private/developer_private_api. h"
66 #include "chrome/browser/extensions/api/dial/dial_api_factory.h" 67 #include "chrome/browser/extensions/api/dial/dial_api_factory.h"
67 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 68 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
68 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" 69 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
69 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h" 70 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
70 #include "chrome/browser/extensions/api/history/history_api.h" 71 #include "chrome/browser/extensions/api/history/history_api.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 DownloadServiceFactory::GetInstance(); 232 DownloadServiceFactory::GetInstance();
232 #if defined(ENABLE_EXTENSIONS) 233 #if defined(ENABLE_EXTENSIONS)
233 AppShortcutManagerFactory::GetInstance(); 234 AppShortcutManagerFactory::GetInstance();
234 apps::AppLoadServiceFactory::GetInstance(); 235 apps::AppLoadServiceFactory::GetInstance();
235 apps::AppRestoreServiceFactory::GetInstance(); 236 apps::AppRestoreServiceFactory::GetInstance();
236 apps::AppWindowGeometryCache::Factory::GetInstance(); 237 apps::AppWindowGeometryCache::Factory::GetInstance();
237 EphemeralAppServiceFactory::GetInstance(); 238 EphemeralAppServiceFactory::GetInstance();
238 extensions::ActivityLog::GetFactoryInstance(); 239 extensions::ActivityLog::GetFactoryInstance();
239 extensions::ActivityLogAPI::GetFactoryInstance(); 240 extensions::ActivityLogAPI::GetFactoryInstance();
240 extensions::AlarmManager::GetFactoryInstance(); 241 extensions::AlarmManager::GetFactoryInstance();
242 extensions::ApiResourceManager<
243 extensions::BluetoothApiSocket>::GetFactoryInstance();
241 extensions::ApiResourceManager<extensions::ResumableTCPServerSocket>:: 244 extensions::ApiResourceManager<extensions::ResumableTCPServerSocket>::
242 GetFactoryInstance(); 245 GetFactoryInstance();
243 extensions::ApiResourceManager<extensions::ResumableTCPSocket>:: 246 extensions::ApiResourceManager<extensions::ResumableTCPSocket>::
244 GetFactoryInstance(); 247 GetFactoryInstance();
245 extensions::ApiResourceManager<extensions::ResumableUDPSocket>:: 248 extensions::ApiResourceManager<extensions::ResumableUDPSocket>::
246 GetFactoryInstance(); 249 GetFactoryInstance();
247 extensions::ApiResourceManager<extensions::SerialConnection>:: 250 extensions::ApiResourceManager<extensions::SerialConnection>::
248 GetFactoryInstance(); 251 GetFactoryInstance();
249 extensions::ApiResourceManager<extensions::Socket>::GetFactoryInstance(); 252 extensions::ApiResourceManager<extensions::Socket>::GetFactoryInstance();
250 extensions::ApiResourceManager<extensions::UsbDeviceResource>:: 253 extensions::ApiResourceManager<extensions::UsbDeviceResource>::
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 #endif 402 #endif
400 #if defined(ENABLE_EXTENSIONS) 403 #if defined(ENABLE_EXTENSIONS)
401 TokenCacheServiceFactory::GetInstance(); 404 TokenCacheServiceFactory::GetInstance();
402 #endif 405 #endif
403 WebDataServiceFactory::GetInstance(); 406 WebDataServiceFactory::GetInstance();
404 } 407 }
405 408
406 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 409 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
407 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 410 EnsureBrowserContextKeyedServiceFactoriesBuilt();
408 } 411 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698