| 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/chrome_history_client.h" | 9 #include "chrome/browser/history/chrome_history_client.h" |
| 10 #include "chrome/browser/history/chrome_history_client_factory.h" | 10 #include "chrome/browser/history/chrome_history_client_factory.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 "HistoryService", BrowserContextDependencyManager::GetInstance()) { | 62 "HistoryService", BrowserContextDependencyManager::GetInstance()) { |
| 63 DependsOn(ChromeHistoryClientFactory::GetInstance()); | 63 DependsOn(ChromeHistoryClientFactory::GetInstance()); |
| 64 } | 64 } |
| 65 | 65 |
| 66 HistoryServiceFactory::~HistoryServiceFactory() { | 66 HistoryServiceFactory::~HistoryServiceFactory() { |
| 67 } | 67 } |
| 68 | 68 |
| 69 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor( | 69 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor( |
| 70 content::BrowserContext* context) const { | 70 content::BrowserContext* context) const { |
| 71 Profile* profile = static_cast<Profile*>(context); | 71 Profile* profile = static_cast<Profile*>(context); |
| 72 HistoryService* history_service = new HistoryService( | 72 scoped_ptr<HistoryService> history_service(new HistoryService( |
| 73 ChromeHistoryClientFactory::GetForProfile(profile), profile); | 73 ChromeHistoryClientFactory::GetForProfile(profile), profile)); |
| 74 if (!history_service->Init(profile->GetPath())) { | 74 if (!history_service->Init(profile->GetPath())) |
| 75 return NULL; | 75 return NULL; |
| 76 } | 76 return history_service.release(); |
| 77 return history_service; | |
| 78 } | 77 } |
| 79 | 78 |
| 80 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( | 79 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( |
| 81 content::BrowserContext* context) const { | 80 content::BrowserContext* context) const { |
| 82 return chrome::GetBrowserContextRedirectedInIncognito(context); | 81 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 83 } | 82 } |
| 84 | 83 |
| 85 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { | 84 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
| 86 return true; | 85 return true; |
| 87 } | 86 } |
| OLD | NEW |