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

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

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Addressed comments Created 8 years, 7 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
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
11 #include "chrome/browser/autofill/personal_data_manager_factory.h" 11 #include "chrome/browser/autofill/personal_data_manager_factory.h"
12 #include "chrome/browser/background/background_contents_service_factory.h" 12 #include "chrome/browser/background/background_contents_service_factory.h"
13 #include "chrome/browser/content_settings/cookie_settings.h" 13 #include "chrome/browser/content_settings/cookie_settings.h"
14 #include "chrome/browser/download/download_service_factory.h" 14 #include "chrome/browser/download/download_service_factory.h"
15 #include "chrome/browser/extensions/extension_command_service_factory.h"
16 #include "chrome/browser/extensions/extension_system_factory.h"
15 #include "chrome/browser/intents/web_intents_registry_factory.h" 17 #include "chrome/browser/intents/web_intents_registry_factory.h"
16 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 18 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
17 #include "chrome/browser/password_manager/password_store_factory.h" 19 #include "chrome/browser/password_manager/password_store_factory.h"
18 #include "chrome/browser/plugin_prefs_factory.h" 20 #include "chrome/browser/plugin_prefs_factory.h"
19 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" 21 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
20 #include "chrome/browser/prerender/prerender_manager_factory.h" 22 #include "chrome/browser/prerender/prerender_manager_factory.h"
21 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 23 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
22 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/profiles/profile_keyed_service.h" 25 #include "chrome/browser/profiles/profile_keyed_service.h"
24 #include "chrome/browser/profiles/profile_keyed_service_factory.h" 26 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // TODO(erg): This needs to be something else. I don't think putting every 171 // TODO(erg): This needs to be something else. I don't think putting every
170 // FooServiceFactory here will scale or is desireable long term. 172 // FooServiceFactory here will scale or is desireable long term.
171 void ProfileDependencyManager::AssertFactoriesBuilt() { 173 void ProfileDependencyManager::AssertFactoriesBuilt() {
172 if (built_factories_) 174 if (built_factories_)
173 return; 175 return;
174 176
175 AutocompleteActionPredictorFactory::GetInstance(); 177 AutocompleteActionPredictorFactory::GetInstance();
176 ChromeURLDataManagerFactory::GetInstance(); 178 ChromeURLDataManagerFactory::GetInstance();
177 CookieSettings::Factory::GetInstance(); 179 CookieSettings::Factory::GetInstance();
178 DownloadServiceFactory::GetInstance(); 180 DownloadServiceFactory::GetInstance();
181 ExtensionCommandServiceFactory::GetInstance();
182 ExtensionSystemFactory::GetInstance();
179 FindBarStateFactory::GetInstance(); 183 FindBarStateFactory::GetInstance();
180 #if defined(USE_AURA) 184 #if defined(USE_AURA)
181 GesturePrefsObserverFactoryAura::GetInstance(); 185 GesturePrefsObserverFactoryAura::GetInstance();
182 #endif 186 #endif
183 GlobalErrorServiceFactory::GetInstance(); 187 GlobalErrorServiceFactory::GetInstance();
184 NTPResourceCacheFactory::GetInstance(); 188 NTPResourceCacheFactory::GetInstance();
185 PasswordStoreFactory::GetInstance(); 189 PasswordStoreFactory::GetInstance();
186 PersonalDataManagerFactory::GetInstance(); 190 PersonalDataManagerFactory::GetInstance();
187 PluginPrefsFactory::GetInstance(); 191 PluginPrefsFactory::GetInstance();
188 prerender::PrerenderManagerFactory::GetInstance(); 192 prerender::PrerenderManagerFactory::GetInstance();
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 } 330 }
327 331
328 result.append("\n /* Toplevel profile */\n"); 332 result.append("\n /* Toplevel profile */\n");
329 result.append(" Profile [shape=box];\n"); 333 result.append(" Profile [shape=box];\n");
330 334
331 result.append("}\n"); 335 result.append("}\n");
332 return result; 336 return result;
333 } 337 }
334 338
335 #endif 339 #endif
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698