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

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: Created 8 years 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 #if defined(ENABLE_CONFIGURATION_POLICY) 82 #if defined(ENABLE_CONFIGURATION_POLICY)
83 #include "chrome/browser/policy/user_policy_signin_service_factory.h" 83 #include "chrome/browser/policy/user_policy_signin_service_factory.h"
84 #endif 84 #endif
85 85
86 #if defined(OS_CHROMEOS) 86 #if defined(OS_CHROMEOS)
87 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h" 87 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h"
88 #include "chrome/browser/extensions/api/input_ime/input_ime_api_factory.h" 88 #include "chrome/browser/extensions/api/input_ime/input_ime_api_factory.h"
89 #endif 89 #endif
90 90
91 #if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION)
92 #include "chrome/browser/chromeos/extensions/media_player_api_factory.h"
93 #endif
94
91 #if defined(USE_AURA) 95 #if defined(USE_AURA)
92 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 96 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
93 #endif 97 #endif
94 98
95 #ifndef NDEBUG 99 #ifndef NDEBUG
96 #include "base/command_line.h" 100 #include "base/command_line.h"
97 #include "base/file_util.h" 101 #include "base/file_util.h"
98 #include "chrome/common/chrome_switches.h" 102 #include "chrome/common/chrome_switches.h"
99 #endif 103 #endif
100 104
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 extensions::ExtensionSystemFactory::GetInstance(); 252 extensions::ExtensionSystemFactory::GetInstance();
249 extensions::FontSettingsAPIFactory::GetInstance(); 253 extensions::FontSettingsAPIFactory::GetInstance();
250 extensions::HistoryAPIFactory::GetInstance(); 254 extensions::HistoryAPIFactory::GetInstance();
251 extensions::IdleManagerFactory::GetInstance(); 255 extensions::IdleManagerFactory::GetInstance();
252 #if defined(OS_CHROMEOS) 256 #if defined(OS_CHROMEOS)
253 extensions::InputImeAPIFactory::GetInstance(); 257 extensions::InputImeAPIFactory::GetInstance();
254 extensions::InputMethodAPIFactory::GetInstance(); 258 extensions::InputMethodAPIFactory::GetInstance();
255 #endif 259 #endif
256 extensions::ManagedModeAPIFactory::GetInstance(); 260 extensions::ManagedModeAPIFactory::GetInstance();
257 extensions::MediaGalleriesPrivateAPIFactory::GetInstance(); 261 extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
262 #if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION)
263 extensions::MediaPlayerAPIFactory::GetInstance();
264 #endif
258 extensions::OmniboxAPIFactory::GetInstance(); 265 extensions::OmniboxAPIFactory::GetInstance();
259 extensions::PreferenceAPIFactory::GetInstance(); 266 extensions::PreferenceAPIFactory::GetInstance();
260 extensions::ProcessesAPIFactory::GetInstance(); 267 extensions::ProcessesAPIFactory::GetInstance();
261 extensions::PushMessagingAPIFactory::GetInstance(); 268 extensions::PushMessagingAPIFactory::GetInstance();
262 extensions::SuggestedLinksRegistryFactory::GetInstance(); 269 extensions::SuggestedLinksRegistryFactory::GetInstance();
263 extensions::TabCaptureRegistryFactory::GetInstance(); 270 extensions::TabCaptureRegistryFactory::GetInstance();
264 extensions::TabsWindowsAPIFactory::GetInstance(); 271 extensions::TabsWindowsAPIFactory::GetInstance();
265 extensions::WebNavigationAPIFactory::GetInstance(); 272 extensions::WebNavigationAPIFactory::GetInstance();
266 ExtensionManagementAPIFactory::GetInstance(); 273 ExtensionManagementAPIFactory::GetInstance();
267 #endif 274 #endif
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 } 430 }
424 431
425 result.append("\n /* Toplevel profile */\n"); 432 result.append("\n /* Toplevel profile */\n");
426 result.append(" Profile [shape=box];\n"); 433 result.append(" Profile [shape=box];\n");
427 434
428 result.append("}\n"); 435 result.append("}\n");
429 return result; 436 return result;
430 } 437 }
431 438
432 #endif 439 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698