| 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 "chrome/browser/favicon/favicon_service.h" | 9 #include "chrome/browser/favicon/favicon_service.h" |
| 9 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
| 10 #include "chrome/browser/history/history_service_factory.h" | 11 #include "chrome/browser/history/history_service_factory.h" |
| 11 #include "chrome/browser/prefs/pref_service.h" | |
| 12 #include "chrome/browser/profiles/profile_dependency_manager.h" | 12 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 14 | 14 |
| 15 // static | 15 // static |
| 16 FaviconService* FaviconServiceFactory::GetForProfile( | 16 FaviconService* FaviconServiceFactory::GetForProfile( |
| 17 Profile* profile, Profile::ServiceAccessType sat) { | 17 Profile* profile, Profile::ServiceAccessType sat) { |
| 18 if (!profile->IsOffTheRecord()) { | 18 if (!profile->IsOffTheRecord()) { |
| 19 return static_cast<FaviconService*>( | 19 return static_cast<FaviconService*>( |
| 20 GetInstance()->GetServiceForProfile(profile, true)); | 20 GetInstance()->GetServiceForProfile(profile, true)); |
| 21 } else if (sat == Profile::EXPLICIT_ACCESS) { | 21 } else if (sat == Profile::EXPLICIT_ACCESS) { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 46 ProfileKeyedService* FaviconServiceFactory::BuildServiceInstanceFor( | 46 ProfileKeyedService* FaviconServiceFactory::BuildServiceInstanceFor( |
| 47 Profile* profile) const { | 47 Profile* profile) const { |
| 48 HistoryService* history_service = HistoryServiceFactory::GetForProfile( | 48 HistoryService* history_service = HistoryServiceFactory::GetForProfile( |
| 49 profile, Profile::EXPLICIT_ACCESS); | 49 profile, Profile::EXPLICIT_ACCESS); |
| 50 return new FaviconService(history_service); | 50 return new FaviconService(history_service); |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { | 53 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { |
| 54 return true; | 54 return true; |
| 55 } | 55 } |
| OLD | NEW |