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

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

Issue 10546083: Convert ProtocolHandlerRegistry to be a ProfileKeyedService. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Reduce differences between orig and updated test. Trying to figure out why tests fail on try server… Created 8 years, 5 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
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/bookmarks/bookmark_model_factory.h" 13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
14 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 14 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
15 #include "chrome/browser/content_settings/cookie_settings.h" 15 #include "chrome/browser/content_settings/cookie_settings.h"
16 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
16 #include "chrome/browser/download/download_service_factory.h" 17 #include "chrome/browser/download/download_service_factory.h"
17 #include "chrome/browser/extensions/api/commands/command_service_factory.h" 18 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
18 #include "chrome/browser/extensions/api/discovery/suggested_links_registry_facto ry.h" 19 #include "chrome/browser/extensions/api/discovery/suggested_links_registry_facto ry.h"
19 #include "chrome/browser/extensions/extension_system_factory.h" 20 #include "chrome/browser/extensions/extension_system_factory.h"
20 #include "chrome/browser/google/google_url_tracker_factory.h" 21 #include "chrome/browser/google/google_url_tracker_factory.h"
21 #include "chrome/browser/history/history_service_factory.h" 22 #include "chrome/browser/history/history_service_factory.h"
22 #include "chrome/browser/intents/web_intents_registry_factory.h" 23 #include "chrome/browser/intents/web_intents_registry_factory.h"
23 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 24 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
24 #include "chrome/browser/password_manager/password_store_factory.h" 25 #include "chrome/browser/password_manager/password_store_factory.h"
25 #include "chrome/browser/plugin_prefs_factory.h" 26 #include "chrome/browser/plugin_prefs_factory.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 PersonalDataManagerFactory::GetInstance(); 222 PersonalDataManagerFactory::GetInstance();
222 #if !defined(OS_ANDROID) 223 #if !defined(OS_ANDROID)
223 PinnedTabServiceFactory::GetInstance(); 224 PinnedTabServiceFactory::GetInstance();
224 #endif 225 #endif
225 PluginPrefsFactory::GetInstance(); 226 PluginPrefsFactory::GetInstance();
226 predictors::AutocompleteActionPredictorFactory::GetInstance(); 227 predictors::AutocompleteActionPredictorFactory::GetInstance();
227 predictors::PredictorDatabaseFactory::GetInstance(); 228 predictors::PredictorDatabaseFactory::GetInstance();
228 predictors::ResourcePrefetchPredictorFactory::GetInstance(); 229 predictors::ResourcePrefetchPredictorFactory::GetInstance();
229 prerender::PrerenderManagerFactory::GetInstance(); 230 prerender::PrerenderManagerFactory::GetInstance();
230 ProfileSyncServiceFactory::GetInstance(); 231 ProfileSyncServiceFactory::GetInstance();
232 ProtocolHandlerRegistryFactory::GetInstance();
231 #if defined(ENABLE_PROTECTOR_SERVICE) 233 #if defined(ENABLE_PROTECTOR_SERVICE)
232 protector::ProtectorServiceFactory::GetInstance(); 234 protector::ProtectorServiceFactory::GetInstance();
233 #endif 235 #endif
234 #if defined(ENABLE_SESSION_SERVICE) 236 #if defined(ENABLE_SESSION_SERVICE)
235 SessionServiceFactory::GetInstance(); 237 SessionServiceFactory::GetInstance();
236 #endif 238 #endif
237 SigninManagerFactory::GetInstance(); 239 SigninManagerFactory::GetInstance();
238 #if defined(ENABLE_INPUT_SPEECH) 240 #if defined(ENABLE_INPUT_SPEECH)
239 SpeechInputExtensionManager::InitializeFactory(); 241 SpeechInputExtensionManager::InitializeFactory();
240 ChromeSpeechRecognitionPreferences::InitializeFactory(); 242 ChromeSpeechRecognitionPreferences::InitializeFactory();
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 } 359 }
358 360
359 result.append("\n /* Toplevel profile */\n"); 361 result.append("\n /* Toplevel profile */\n");
360 result.append(" Profile [shape=box];\n"); 362 result.append(" Profile [shape=box];\n");
361 363
362 result.append("}\n"); 364 result.append("}\n");
363 return result; 365 return result;
364 } 366 }
365 367
366 #endif 368 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698