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/history/history_service_factory.h" | 5 #include "chrome/browser/history/history_service_factory.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 9 #include "chrome/browser/history/history_client_factory.h" |
9 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
10 #include "chrome/browser/profiles/incognito_helpers.h" | 11 #include "chrome/browser/profiles/incognito_helpers.h" |
11 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
12 #include "components/bookmarks/browser/bookmark_model.h" | 13 #include "components/bookmarks/browser/bookmark_model.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 HistoryService* HistoryServiceFactory::GetForProfile( | 17 HistoryService* HistoryServiceFactory::GetForProfile( |
17 Profile* profile, Profile::ServiceAccessType sat) { | 18 Profile* profile, Profile::ServiceAccessType sat) { |
18 // If saving history is disabled, only allow explicit access. | 19 // If saving history is disabled, only allow explicit access. |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 // static | 53 // static |
53 void HistoryServiceFactory::ShutdownForProfile(Profile* profile) { | 54 void HistoryServiceFactory::ShutdownForProfile(Profile* profile) { |
54 HistoryServiceFactory* factory = GetInstance(); | 55 HistoryServiceFactory* factory = GetInstance(); |
55 factory->BrowserContextDestroyed(profile); | 56 factory->BrowserContextDestroyed(profile); |
56 } | 57 } |
57 | 58 |
58 HistoryServiceFactory::HistoryServiceFactory() | 59 HistoryServiceFactory::HistoryServiceFactory() |
59 : BrowserContextKeyedServiceFactory( | 60 : BrowserContextKeyedServiceFactory( |
60 "HistoryService", BrowserContextDependencyManager::GetInstance()) { | 61 "HistoryService", BrowserContextDependencyManager::GetInstance()) { |
61 DependsOn(BookmarkModelFactory::GetInstance()); | 62 DependsOn(BookmarkModelFactory::GetInstance()); |
| 63 DependsOn(HistoryClientFactory::GetInstance()); |
62 } | 64 } |
63 | 65 |
64 HistoryServiceFactory::~HistoryServiceFactory() { | 66 HistoryServiceFactory::~HistoryServiceFactory() { |
65 } | 67 } |
66 | 68 |
67 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor( | 69 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor( |
68 content::BrowserContext* context) const { | 70 content::BrowserContext* context) const { |
69 Profile* profile = static_cast<Profile*>(context); | 71 Profile* profile = static_cast<Profile*>(context); |
70 HistoryService* history_service = new HistoryService(profile); | 72 HistoryService* history_service = |
| 73 new HistoryService(HistoryClientFactory::GetForProfile(profile), profile); |
71 if (!history_service->Init(profile->GetPath(), | 74 if (!history_service->Init(profile->GetPath(), |
72 BookmarkModelFactory::GetForProfile(profile))) { | 75 BookmarkModelFactory::GetForProfile(profile))) { |
73 return NULL; | 76 return NULL; |
74 } | 77 } |
75 return history_service; | 78 return history_service; |
76 } | 79 } |
77 | 80 |
78 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( | 81 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( |
79 content::BrowserContext* context) const { | 82 content::BrowserContext* context) const { |
80 return chrome::GetBrowserContextRedirectedInIncognito(context); | 83 return chrome::GetBrowserContextRedirectedInIncognito(context); |
81 } | 84 } |
82 | 85 |
83 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { | 86 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
84 return true; | 87 return true; |
85 } | 88 } |
OLD | NEW |