| 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_service.h" | 9 #include "chrome/browser/history/history_service.h" |
| 10 #include "chrome/browser/profiles/incognito_helpers.h" | 10 #include "chrome/browser/profiles/incognito_helpers.h" |
| 11 #include "chrome/common/pref_names.h" | 11 #include "chrome/common/pref_names.h" |
| 12 #include "components/bookmarks/core/browser/bookmark_model.h" | 12 #include "components/bookmarks/browser/bookmark_model.h" |
| 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| 14 | 14 |
| 15 // static | 15 // static |
| 16 HistoryService* HistoryServiceFactory::GetForProfile( | 16 HistoryService* HistoryServiceFactory::GetForProfile( |
| 17 Profile* profile, Profile::ServiceAccessType sat) { | 17 Profile* profile, Profile::ServiceAccessType sat) { |
| 18 // If saving history is disabled, only allow explicit access. | 18 // If saving history is disabled, only allow explicit access. |
| 19 if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) && | 19 if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) && |
| 20 sat != Profile::EXPLICIT_ACCESS) | 20 sat != Profile::EXPLICIT_ACCESS) |
| 21 return NULL; | 21 return NULL; |
| 22 | 22 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 } | 76 } |
| 77 | 77 |
| 78 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( | 78 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( |
| 79 content::BrowserContext* context) const { | 79 content::BrowserContext* context) const { |
| 80 return chrome::GetBrowserContextRedirectedInIncognito(context); | 80 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 81 } | 81 } |
| 82 | 82 |
| 83 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { | 83 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
| 84 return true; | 84 return true; |
| 85 } | 85 } |
| OLD | NEW |