chrome/browser/extensions/browser_context_keyed_service_factories.cc - Issue 610093002: Revert "Tempolarily exclude extensions API that are causing crash on Athena"

Side by Side Diff: chrome/browser/extensions/browser_context_keyed_service_factories.cc

Issue 610093002: Revert "Tempolarily exclude extensions API that are causing crash on Athena" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/extensions/BUILD.gn ('k') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/extensions/browser_context_keyed_service_factories.h"	5 #include "chrome/browser/extensions/browser_context_keyed_service_factories.h"

6	6

7 #include "chrome/browser/extensions/activity_log/activity_log.h"	7 #include "chrome/browser/extensions/activity_log/activity_log.h"

8 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h"	8 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h"

9 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"	9 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"

10 #include "chrome/browser/extensions/api/audio/audio_api.h"	10 #include "chrome/browser/extensions/api/audio/audio_api.h"

(...skipping 124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 #endif	135 #endif

136 extensions::OmniboxAPI::GetFactoryInstance();	136 extensions::OmniboxAPI::GetFactoryInstance();

137 #if defined(ENABLE_PLUGINS)	137 #if defined(ENABLE_PLUGINS)

138 extensions::PluginManager::GetFactoryInstance();	138 extensions::PluginManager::GetFactoryInstance();

139 #endif // defined(ENABLE_PLUGINS)	139 #endif // defined(ENABLE_PLUGINS)

140 extensions::PowerApiManager::GetFactoryInstance();	140 extensions::PowerApiManager::GetFactoryInstance();

141 extensions::PreferenceAPI::GetFactoryInstance();	141 extensions::PreferenceAPI::GetFactoryInstance();

142 extensions::ProcessesAPI::GetFactoryInstance();	142 extensions::ProcessesAPI::GetFactoryInstance();

143 extensions::PushMessagingAPI::GetFactoryInstance();	143 extensions::PushMessagingAPI::GetFactoryInstance();

144 extensions::ScreenlockPrivateEventRouter::GetFactoryInstance();	144 extensions::ScreenlockPrivateEventRouter::GetFactoryInstance();

145 #if !defined(USE_ATHENA)

146 extensions::SessionsAPI::GetFactoryInstance();	145 extensions::SessionsAPI::GetFactoryInstance();

147 #endif

148 extensions::SettingsOverridesAPI::GetFactoryInstance();	146 extensions::SettingsOverridesAPI::GetFactoryInstance();

149 extensions::SignedInDevicesManager::GetFactoryInstance();	147 extensions::SignedInDevicesManager::GetFactoryInstance();

150 #if defined(ENABLE_SPELLCHECK)	148 #if defined(ENABLE_SPELLCHECK)

151 extensions::SpellcheckAPI::GetFactoryInstance();	149 extensions::SpellcheckAPI::GetFactoryInstance();

152 #endif	150 #endif

153 extensions::StreamsPrivateAPI::GetFactoryInstance();	151 extensions::StreamsPrivateAPI::GetFactoryInstance();

154 #if !defined(USE_ATHENA)

155 extensions::TabCaptureRegistry::GetFactoryInstance();	152 extensions::TabCaptureRegistry::GetFactoryInstance();

156 extensions::TabsWindowsAPI::GetFactoryInstance();	153 extensions::TabsWindowsAPI::GetFactoryInstance();

157 #endif

158 extensions::TtsAPI::GetFactoryInstance();	154 extensions::TtsAPI::GetFactoryInstance();

159 extensions::WebNavigationAPI::GetFactoryInstance();	155 extensions::WebNavigationAPI::GetFactoryInstance();

160 extensions::WebRequestAPI::GetFactoryInstance();	156 extensions::WebRequestAPI::GetFactoryInstance();

161 extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();	157 extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();

162 extensions::WebstoreAPI::GetFactoryInstance();	158 extensions::WebstoreAPI::GetFactoryInstance();

163 #if defined(OS_CHROMEOS)	159 #if defined(OS_CHROMEOS)

164 file_manager::EventRouterFactory::GetInstance();	160 file_manager::EventRouterFactory::GetInstance();

165 #endif	161 #endif

166 TokenCacheServiceFactory::GetInstance();	162 TokenCacheServiceFactory::GetInstance();

167 extensions::ExtensionGCMAppHandler::GetFactoryInstance();	163 extensions::ExtensionGCMAppHandler::GetFactoryInstance();

168 extensions::core_api::BluetoothSocketEventDispatcher::GetFactoryInstance();	164 extensions::core_api::BluetoothSocketEventDispatcher::GetFactoryInstance();

169 }	165 }

170	166

171 } // namespace chrome_extensions	167 } // namespace chrome_extensions

OLD	NEW