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

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

Issue 11638024: Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: patch rebased Created 7 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/profile_dependency_manager.h" 5 #include "chrome/browser/profiles/profile_dependency_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 #include <iterator> 9 #include <iterator>
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 80 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
81 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 81 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
82 #endif 82 #endif
83 83
84 #if defined(ENABLE_CONFIGURATION_POLICY) 84 #if defined(ENABLE_CONFIGURATION_POLICY)
85 #include "chrome/browser/policy/user_policy_signin_service_factory.h" 85 #include "chrome/browser/policy/user_policy_signin_service_factory.h"
86 #endif 86 #endif
87 87
88 #if defined(OS_CHROMEOS) 88 #if defined(OS_CHROMEOS)
89 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h" 89 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h"
90 #include "chrome/browser/chromeos/extensions/media_player_api.h"
90 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" 91 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
91 #if defined(FILE_MANAGER_EXTENSION) 92 #if defined(FILE_MANAGER_EXTENSION)
92 #include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h" 93 #include "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h"
93 #endif 94 #endif
94 #endif 95 #endif
95 96
96 #if defined(USE_AURA) 97 #if defined(USE_AURA)
97 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 98 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
98 #endif 99 #endif
99 100
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 extensions::FontSettingsAPIFactory::GetInstance(); 256 extensions::FontSettingsAPIFactory::GetInstance();
256 extensions::HistoryAPIFactory::GetInstance(); 257 extensions::HistoryAPIFactory::GetInstance();
257 extensions::IdleManagerFactory::GetInstance(); 258 extensions::IdleManagerFactory::GetInstance();
258 #if defined(OS_CHROMEOS) 259 #if defined(OS_CHROMEOS)
259 extensions::InputImeAPI::GetFactoryInstance(); 260 extensions::InputImeAPI::GetFactoryInstance();
260 extensions::InputMethodAPIFactory::GetInstance(); 261 extensions::InputMethodAPIFactory::GetInstance();
261 #endif 262 #endif
262 extensions::ManagedModeAPI::GetFactoryInstance(); 263 extensions::ManagedModeAPI::GetFactoryInstance();
263 extensions::ManagementAPI::GetFactoryInstance(); 264 extensions::ManagementAPI::GetFactoryInstance();
264 extensions::MediaGalleriesPrivateAPIFactory::GetInstance(); 265 extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
266 #if defined(OS_CHROMEOS)
267 extensions::MediaPlayerAPI::GetFactoryInstance();
268 #endif
265 extensions::OmniboxAPI::GetFactoryInstance(); 269 extensions::OmniboxAPI::GetFactoryInstance();
266 extensions::PreferenceAPI::GetFactoryInstance(); 270 extensions::PreferenceAPI::GetFactoryInstance();
267 extensions::ProcessesAPI::GetFactoryInstance(); 271 extensions::ProcessesAPI::GetFactoryInstance();
268 extensions::PushMessagingAPI::GetFactoryInstance(); 272 extensions::PushMessagingAPI::GetFactoryInstance();
269 extensions::SuggestedLinksRegistryFactory::GetInstance(); 273 extensions::SuggestedLinksRegistryFactory::GetInstance();
270 extensions::TabCaptureRegistryFactory::GetInstance(); 274 extensions::TabCaptureRegistryFactory::GetInstance();
271 extensions::TabsWindowsAPI::GetFactoryInstance(); 275 extensions::TabsWindowsAPI::GetFactoryInstance();
272 extensions::WebNavigationAPI::GetFactoryInstance(); 276 extensions::WebNavigationAPI::GetFactoryInstance();
273 #endif 277 #endif
274 FaviconServiceFactory::GetInstance(); 278 FaviconServiceFactory::GetInstance();
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 } 439 }
436 440
437 result.append("\n /* Toplevel profile */\n"); 441 result.append("\n /* Toplevel profile */\n");
438 result.append(" Profile [shape=box];\n"); 442 result.append(" Profile [shape=box];\n");
439 443
440 result.append("}\n"); 444 result.append("}\n");
441 return result; 445 return result;
442 } 446 }
443 447
444 #endif 448 #endif
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698