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 "chrome/browser/bookmarks/bookmark_model.h" | 7 #include "chrome/browser/bookmarks/bookmark_model.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.h" | 9 #include "chrome/browser/history/history.h" |
10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 HistoryServiceFactory::BuildServiceInstanceFor(Profile* profile) const { | 67 HistoryServiceFactory::BuildServiceInstanceFor(Profile* profile) const { |
68 scoped_refptr<HistoryService> history_service( | 68 scoped_refptr<HistoryService> history_service( |
69 new HistoryService(profile)); | 69 new HistoryService(profile)); |
70 if (!history_service->Init(profile->GetPath(), | 70 if (!history_service->Init(profile->GetPath(), |
71 BookmarkModelFactory::GetForProfile(profile))) { | 71 BookmarkModelFactory::GetForProfile(profile))) { |
72 return NULL; | 72 return NULL; |
73 } | 73 } |
74 return history_service; | 74 return history_service; |
75 } | 75 } |
76 | 76 |
77 bool HistoryServiceFactory::ServiceRedirectedInIncognito() { | 77 bool HistoryServiceFactory::ServiceRedirectedInIncognito() const { |
78 return true; | 78 return true; |
79 } | 79 } |
80 | 80 |
81 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() { | 81 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
82 return true; | 82 return true; |
83 } | 83 } |
OLD | NEW |