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/search_engines/template_url_fetcher_factory.h" | 5 #include "chrome/browser/search_engines/template_url_fetcher_factory.h" |
6 | 6 |
7 #include "chrome/browser/profiles/incognito_helpers.h" | 7 #include "chrome/browser/profiles/incognito_helpers.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/search_engines/template_url_service_factory.h" | 9 #include "chrome/browser/search_engines/template_url_service_factory.h" |
10 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 10 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
11 #include "components/search_engines/template_url_fetcher.h" | 11 #include "components/search_engines/template_url_fetcher.h" |
| 12 #include "content/public/browser/storage_partition.h" |
12 | 13 |
13 // static | 14 // static |
14 TemplateURLFetcher* TemplateURLFetcherFactory::GetForProfile( | 15 TemplateURLFetcher* TemplateURLFetcherFactory::GetForProfile( |
15 Profile* profile) { | 16 Profile* profile) { |
16 return static_cast<TemplateURLFetcher*>( | 17 return static_cast<TemplateURLFetcher*>( |
17 GetInstance()->GetServiceForBrowserContext(profile, true)); | 18 GetInstance()->GetServiceForBrowserContext(profile, true)); |
18 } | 19 } |
19 | 20 |
20 // static | 21 // static |
21 TemplateURLFetcherFactory* TemplateURLFetcherFactory::GetInstance() { | 22 TemplateURLFetcherFactory* TemplateURLFetcherFactory::GetInstance() { |
(...skipping 14 matching lines...) Expand all Loading... |
36 DependsOn(TemplateURLServiceFactory::GetInstance()); | 37 DependsOn(TemplateURLServiceFactory::GetInstance()); |
37 } | 38 } |
38 | 39 |
39 TemplateURLFetcherFactory::~TemplateURLFetcherFactory() { | 40 TemplateURLFetcherFactory::~TemplateURLFetcherFactory() { |
40 } | 41 } |
41 | 42 |
42 KeyedService* TemplateURLFetcherFactory::BuildServiceInstanceFor( | 43 KeyedService* TemplateURLFetcherFactory::BuildServiceInstanceFor( |
43 content::BrowserContext* profile) const { | 44 content::BrowserContext* profile) const { |
44 return new TemplateURLFetcher( | 45 return new TemplateURLFetcher( |
45 TemplateURLServiceFactory::GetForProfile(static_cast<Profile*>(profile)), | 46 TemplateURLServiceFactory::GetForProfile(static_cast<Profile*>(profile)), |
46 profile->GetRequestContext()); | 47 content::BrowserContext::GetDefaultStoragePartition(profile)-> |
| 48 GetURLRequestContext()); |
47 } | 49 } |
48 | 50 |
49 content::BrowserContext* TemplateURLFetcherFactory::GetBrowserContextToUse( | 51 content::BrowserContext* TemplateURLFetcherFactory::GetBrowserContextToUse( |
50 content::BrowserContext* context) const { | 52 content::BrowserContext* context) const { |
51 return chrome::GetBrowserContextRedirectedInIncognito(context); | 53 return chrome::GetBrowserContextRedirectedInIncognito(context); |
52 } | 54 } |
OLD | NEW |