OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/instant_service_factory.h" | 5 #include "chrome/browser/search/instant_service_factory.h" |
6 | 6 |
7 #include "chrome/browser/history/top_sites_factory.h" | 7 #include "chrome/browser/history/top_sites_factory.h" |
8 #include "chrome/browser/profiles/incognito_helpers.h" | 8 #include "chrome/browser/profiles/incognito_helpers.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search/instant_service.h" | 10 #include "chrome/browser/search/instant_service.h" |
11 #include "chrome/browser/search_engines/template_url_service_factory.h" | 11 #include "chrome/browser/search_engines/template_url_service_factory.h" |
12 #include "chrome/browser/themes/theme_service_factory.h" | 12 #include "chrome/browser/themes/theme_service_factory.h" |
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
14 #include "components/search/search.h" | 14 #include "components/search/search.h" |
15 | 15 |
16 // static | 16 // static |
17 InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { | 17 InstantService* InstantServiceFactory::GetForProfile(Profile* profile) { |
18 if (!chrome::IsInstantExtendedAPIEnabled()) | 18 if (!search::IsInstantExtendedAPIEnabled()) |
19 return NULL; | 19 return NULL; |
20 | 20 |
21 return static_cast<InstantService*>( | 21 return static_cast<InstantService*>( |
22 GetInstance()->GetServiceForBrowserContext(profile, true)); | 22 GetInstance()->GetServiceForBrowserContext(profile, true)); |
23 } | 23 } |
24 | 24 |
25 // static | 25 // static |
26 InstantServiceFactory* InstantServiceFactory::GetInstance() { | 26 InstantServiceFactory* InstantServiceFactory::GetInstance() { |
27 return Singleton<InstantServiceFactory>::get(); | 27 return Singleton<InstantServiceFactory>::get(); |
28 } | 28 } |
(...skipping 12 matching lines...) Expand all Loading... |
41 InstantServiceFactory::~InstantServiceFactory() { | 41 InstantServiceFactory::~InstantServiceFactory() { |
42 } | 42 } |
43 | 43 |
44 content::BrowserContext* InstantServiceFactory::GetBrowserContextToUse( | 44 content::BrowserContext* InstantServiceFactory::GetBrowserContextToUse( |
45 content::BrowserContext* context) const { | 45 content::BrowserContext* context) const { |
46 return chrome::GetBrowserContextOwnInstanceInIncognito(context); | 46 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
47 } | 47 } |
48 | 48 |
49 KeyedService* InstantServiceFactory::BuildServiceInstanceFor( | 49 KeyedService* InstantServiceFactory::BuildServiceInstanceFor( |
50 content::BrowserContext* profile) const { | 50 content::BrowserContext* profile) const { |
51 return chrome::IsInstantExtendedAPIEnabled() ? | 51 return search::IsInstantExtendedAPIEnabled() |
52 new InstantService(static_cast<Profile*>(profile)) : NULL; | 52 ? new InstantService(static_cast<Profile*>(profile)) |
| 53 : NULL; |
53 } | 54 } |
OLD | NEW |