chrome/browser/webdata/web_data_service_factory.cc - Issue 368273011: Revert of Componentize TemplateURLService

Side by Side Diff: chrome/browser/webdata/web_data_service_factory.cc

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/webdata/keyword_web_data_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
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/webdata/web_data_service_factory.h"	5 #include "chrome/browser/webdata/web_data_service_factory.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/profiles/incognito_helpers.h"	10 #include "chrome/browser/profiles/incognito_helpers.h"

11 #include "chrome/browser/sync/glue/sync_start_util.h"	11 #include "chrome/browser/sync/glue/sync_start_util.h"

12 #include "chrome/browser/ui/profile_error_dialog.h"	12 #include "chrome/browser/ui/profile_error_dialog.h"

13 #include "chrome/browser/webdata/autocomplete_syncable_service.h"	13 #include "chrome/browser/webdata/autocomplete_syncable_service.h"

	14 #include "chrome/browser/webdata/keyword_table.h"

	15 #include "chrome/browser/webdata/keyword_web_data_service.h"

14 #include "chrome/browser/webdata/logins_table.h"	16 #include "chrome/browser/webdata/logins_table.h"

15 #include "chrome/browser/webdata/web_apps_table.h"	17 #include "chrome/browser/webdata/web_apps_table.h"

16 #include "chrome/browser/webdata/web_data_service.h"	18 #include "chrome/browser/webdata/web_data_service.h"

17 #include "chrome/browser/webdata/web_intents_table.h"	19 #include "chrome/browser/webdata/web_intents_table.h"

18 #include "components/autofill/core/browser/autofill_country.h"	20 #include "components/autofill/core/browser/autofill_country.h"

19 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h"	21 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h"

20 #include "components/autofill/core/browser/webdata/autofill_table.h"	22 #include "components/autofill/core/browser/webdata/autofill_table.h"

21 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"	23 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"

22 #include "components/keyed_service/content/browser_context_dependency_manager.h"	24 #include "components/keyed_service/content/browser_context_dependency_manager.h"

23 #include "components/search_engines/keyword_table.h"

24 #include "components/search_engines/keyword_web_data_service.h"

25 #include "components/signin/core/browser/webdata/token_service_table.h"	25 #include "components/signin/core/browser/webdata/token_service_table.h"

26 #include "components/signin/core/browser/webdata/token_web_data.h"	26 #include "components/signin/core/browser/webdata/token_web_data.h"

27 #include "components/webdata/common/webdata_constants.h"	27 #include "components/webdata/common/webdata_constants.h"

28 #include "content/public/browser/browser_thread.h"	28 #include "content/public/browser/browser_thread.h"

29 #include "grit/chromium_strings.h"	29 #include "grit/chromium_strings.h"

30 #include "grit/generated_resources.h"	30 #include "grit/generated_resources.h"

31	31

32 using autofill::AutofillWebDataService;	32 using autofill::AutofillWebDataService;

33 using autofill::AutofillProfileSyncableService;	33 using autofill::AutofillProfileSyncableService;

34 using content::BrowserThread;	34 using content::BrowserThread;

(...skipping 218 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
253 }	253 }

254	254

255 KeyedService* WebDataServiceFactory::BuildServiceInstanceFor(	255 KeyedService* WebDataServiceFactory::BuildServiceInstanceFor(

256 content::BrowserContext* profile) const {	256 content::BrowserContext* profile) const {

257 return new WebDataServiceWrapper(static_cast<Profile*>(profile));	257 return new WebDataServiceWrapper(static_cast<Profile*>(profile));

258 }	258 }

259	259

260 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {	260 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {

261 return true;	261 return true;

262 }	262 }

OLD	NEW