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

Side by Side Diff: chrome/browser/search_engines/template_url_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
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/search_engines/template_url_service_factory.h" 5 #include "chrome/browser/search_engines/template_url_service_factory.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/google/google_url_tracker_factory.h" 12 #include "chrome/browser/google/google_url_tracker_factory.h"
13 #include "chrome/browser/history/history_service_factory.h" 13 #include "chrome/browser/history/history_service_factory.h"
14 #include "chrome/browser/profiles/incognito_helpers.h" 14 #include "chrome/browser/profiles/incognito_helpers.h"
15 #include "chrome/browser/rlz/rlz.h" 15 #include "chrome/browser/rlz/rlz.h"
16 #include "chrome/browser/search_engines/chrome_template_url_service_client.h" 16 #include "chrome/browser/search_engines/chrome_template_url_service_client.h"
17 #include "chrome/browser/search_engines/template_url_service.h"
17 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 18 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
18 #include "chrome/browser/webdata/web_data_service_factory.h" 19 #include "chrome/browser/webdata/web_data_service_factory.h"
19 #include "components/keyed_service/content/browser_context_dependency_manager.h" 20 #include "components/keyed_service/content/browser_context_dependency_manager.h"
20 #include "components/pref_registry/pref_registry_syncable.h" 21 #include "components/pref_registry/pref_registry_syncable.h"
21 #include "components/search_engines/default_search_manager.h" 22 #include "components/search_engines/default_search_manager.h"
22 #include "components/search_engines/search_engines_pref_names.h" 23 #include "components/search_engines/search_engines_pref_names.h"
23 #include "components/search_engines/template_url_service.h"
24 24
25 // static 25 // static
26 TemplateURLService* TemplateURLServiceFactory::GetForProfile(Profile* profile) { 26 TemplateURLService* TemplateURLServiceFactory::GetForProfile(Profile* profile) {
27 return static_cast<TemplateURLService*>( 27 return static_cast<TemplateURLService*>(
28 GetInstance()->GetServiceForBrowserContext(profile, true)); 28 GetInstance()->GetServiceForBrowserContext(profile, true));
29 } 29 }
30 30
31 // static 31 // static
32 TemplateURLServiceFactory* TemplateURLServiceFactory::GetInstance() { 32 TemplateURLServiceFactory* TemplateURLServiceFactory::GetInstance() {
33 return Singleton<TemplateURLServiceFactory>::get(); 33 return Singleton<TemplateURLServiceFactory>::get();
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 153
154 content::BrowserContext* TemplateURLServiceFactory::GetBrowserContextToUse( 154 content::BrowserContext* TemplateURLServiceFactory::GetBrowserContextToUse(
155 content::BrowserContext* context) const { 155 content::BrowserContext* context) const {
156 return chrome::GetBrowserContextRedirectedInIncognito(context); 156 return chrome::GetBrowserContextRedirectedInIncognito(context);
157 } 157 }
158 158
159 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const { 159 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const {
160 return true; 160 return true;
161 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698