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 "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
9 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
10 #include "chrome/browser/prefs/pref_service.h" | |
11 #include "chrome/browser/profiles/profile_dependency_manager.h" | 11 #include "chrome/browser/profiles/profile_dependency_manager.h" |
12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
13 | 13 |
14 // static | 14 // static |
15 HistoryService* HistoryServiceFactory::GetForProfile( | 15 HistoryService* HistoryServiceFactory::GetForProfile( |
16 Profile* profile, Profile::ServiceAccessType sat) { | 16 Profile* profile, Profile::ServiceAccessType sat) { |
17 // If saving history is disabled, only allow explicit access. | 17 // If saving history is disabled, only allow explicit access. |
18 if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) && | 18 if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) && |
19 sat != Profile::EXPLICIT_ACCESS) | 19 sat != Profile::EXPLICIT_ACCESS) |
20 return NULL; | 20 return NULL; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 return history_service; | 73 return history_service; |
74 } | 74 } |
75 | 75 |
76 bool HistoryServiceFactory::ServiceRedirectedInIncognito() const { | 76 bool HistoryServiceFactory::ServiceRedirectedInIncognito() const { |
77 return true; | 77 return true; |
78 } | 78 } |
79 | 79 |
80 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { | 80 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
81 return true; | 81 return true; |
82 } | 82 } |
OLD | NEW |