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/favicon/favicon_service_factory.h" | 5 #include "chrome/browser/favicon/favicon_service_factory.h" |
6 | 6 |
7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h" | 9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h" |
10 #include "chrome/browser/favicon/favicon_service.h" | 10 #include "chrome/browser/favicon/favicon_service.h" |
11 #include "chrome/browser/history/history_service.h" | 11 #include "chrome/browser/history/history_service.h" |
12 #include "chrome/browser/history/history_service_factory.h" | 12 #include "chrome/browser/history/history_service_factory.h" |
| 13 #include "chrome/browser/profiles/profile.h" |
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 14 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
14 | 15 |
15 // static | 16 // static |
16 FaviconService* FaviconServiceFactory::GetForProfile( | 17 FaviconService* FaviconServiceFactory::GetForProfile(Profile* profile, |
17 Profile* profile, Profile::ServiceAccessType sat) { | 18 ServiceAccessType sat) { |
18 if (!profile->IsOffTheRecord()) { | 19 if (!profile->IsOffTheRecord()) { |
19 return static_cast<FaviconService*>( | 20 return static_cast<FaviconService*>( |
20 GetInstance()->GetServiceForBrowserContext(profile, true)); | 21 GetInstance()->GetServiceForBrowserContext(profile, true)); |
21 } else if (sat == Profile::EXPLICIT_ACCESS) { | 22 } else if (sat == ServiceAccessType::EXPLICIT_ACCESS) { |
22 // Profile must be OffTheRecord in this case. | 23 // Profile must be OffTheRecord in this case. |
23 return static_cast<FaviconService*>( | 24 return static_cast<FaviconService*>( |
24 GetInstance()->GetServiceForBrowserContext( | 25 GetInstance()->GetServiceForBrowserContext( |
25 profile->GetOriginalProfile(), true)); | 26 profile->GetOriginalProfile(), true)); |
26 } | 27 } |
27 | 28 |
28 // Profile is OffTheRecord without access. | 29 // Profile is OffTheRecord without access. |
29 NOTREACHED() << "This profile is OffTheRecord"; | 30 NOTREACHED() << "This profile is OffTheRecord"; |
30 return NULL; | 31 return NULL; |
31 } | 32 } |
(...skipping 16 matching lines...) Expand all Loading... |
48 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor( | 49 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor( |
49 content::BrowserContext* profile) const { | 50 content::BrowserContext* profile) const { |
50 FaviconClient* favicon_client = | 51 FaviconClient* favicon_client = |
51 ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile)); | 52 ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile)); |
52 return new FaviconService(static_cast<Profile*>(profile), favicon_client); | 53 return new FaviconService(static_cast<Profile*>(profile), favicon_client); |
53 } | 54 } |
54 | 55 |
55 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { | 56 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { |
56 return true; | 57 return true; |
57 } | 58 } |
OLD | NEW |