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

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

Issue 9834056: Moved WebDataService to ProfileKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upload rebase Created 8 years, 8 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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 19 matching lines...) Expand all
30 #include "chrome/browser/signin/signin_manager_factory.h" 30 #include "chrome/browser/signin/signin_manager_factory.h"
31 #include "chrome/browser/signin/token_service_factory.h" 31 #include "chrome/browser/signin/token_service_factory.h"
32 #include "chrome/browser/speech/speech_input_extension_manager.h" 32 #include "chrome/browser/speech/speech_input_extension_manager.h"
33 #include "chrome/browser/spellchecker/spellcheck_factory.h" 33 #include "chrome/browser/spellchecker/spellcheck_factory.h"
34 #include "chrome/browser/sync/profile_sync_service_factory.h" 34 #include "chrome/browser/sync/profile_sync_service_factory.h"
35 #include "chrome/browser/tabs/pinned_tab_service_factory.h" 35 #include "chrome/browser/tabs/pinned_tab_service_factory.h"
36 #include "chrome/browser/themes/theme_service_factory.h" 36 #include "chrome/browser/themes/theme_service_factory.h"
37 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" 37 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
38 #include "chrome/browser/ui/global_error_service_factory.h" 38 #include "chrome/browser/ui/global_error_service_factory.h"
39 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" 39 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
40 40 #include "chrome/browser/webdata/web_data_service_factory.h"
41 #ifndef NDEBUG 41 #ifndef NDEBUG
42 #include "base/command_line.h" 42 #include "base/command_line.h"
43 #include "base/file_util.h" 43 #include "base/file_util.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #endif 45 #endif
46 46
47 class Profile; 47 class Profile;
48 48
49 void ProfileDependencyManager::AddComponent( 49 void ProfileDependencyManager::AddComponent(
50 ProfileKeyedBaseFactory* component) { 50 ProfileKeyedBaseFactory* component) {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 #endif 199 #endif
200 #if defined(ENABLE_INPUT_SPEECH) 200 #if defined(ENABLE_INPUT_SPEECH)
201 SpeechInputExtensionManager::InitializeFactory(); 201 SpeechInputExtensionManager::InitializeFactory();
202 #endif 202 #endif
203 #if defined(ENABLE_THEMES) 203 #if defined(ENABLE_THEMES)
204 ThemeServiceFactory::GetInstance(); 204 ThemeServiceFactory::GetInstance();
205 #endif 205 #endif
206 #if defined(ENABLE_WEB_INTENTS) 206 #if defined(ENABLE_WEB_INTENTS)
207 WebIntentsRegistryFactory::GetInstance(); 207 WebIntentsRegistryFactory::GetInstance();
208 #endif 208 #endif
209 WebDataServiceFactory::GetInstance();
209 210
210 built_factories_ = true; 211 built_factories_ = true;
211 } 212 }
212 213
213 void ProfileDependencyManager::BuildDestructionOrder(Profile* profile) { 214 void ProfileDependencyManager::BuildDestructionOrder(Profile* profile) {
214 #if !defined(NDEBUG) 215 #if !defined(NDEBUG)
215 // Whenever we try to build a destruction ordering, we should also dump a 216 // Whenever we try to build a destruction ordering, we should also dump a
216 // dependency graph to "/path/to/profile/profile-dependencies.dot". 217 // dependency graph to "/path/to/profile/profile-dependencies.dot".
217 if (CommandLine::ForCurrentProcess()->HasSwitch( 218 if (CommandLine::ForCurrentProcess()->HasSwitch(
218 switches::kDumpProfileDependencyGraph)) { 219 switches::kDumpProfileDependencyGraph)) {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 314 }
314 315
315 result.append("\n /* Toplevel profile */\n"); 316 result.append("\n /* Toplevel profile */\n");
316 result.append(" Profile [shape=box];\n"); 317 result.append(" Profile [shape=box];\n");
317 318
318 result.append("}\n"); 319 result.append("}\n");
319 return result; 320 return result;
320 } 321 }
321 322
322 #endif 323 #endif
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698