Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3800)

Unified Diff: chrome/browser/history/history_service_factory.cc

Issue 839193002: Move ServiceAccessType into //components/keyed_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation on android Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/history/history_service_factory.h ('k') | chrome/browser/history/history_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_service_factory.cc
diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/history/history_service_factory.cc
index 52d2826baab9891f79744f57726e642314c5f4a8..8955bdc6024ef0023a2036039cae74c82adde5e8 100644
--- a/chrome/browser/history/history_service_factory.cc
+++ b/chrome/browser/history/history_service_factory.cc
@@ -12,16 +12,18 @@
#include "chrome/browser/history/chrome_history_client_factory.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/profiles/incognito_helpers.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/keyed_service/core/service_access_type.h"
// static
-HistoryService* HistoryServiceFactory::GetForProfile(
- Profile* profile, Profile::ServiceAccessType sat) {
+HistoryService* HistoryServiceFactory::GetForProfile(Profile* profile,
+ ServiceAccessType sat) {
// If saving history is disabled, only allow explicit access.
if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) &&
- sat != Profile::EXPLICIT_ACCESS)
+ sat != ServiceAccessType::EXPLICIT_ACCESS)
return NULL;
return static_cast<HistoryService*>(
@@ -29,12 +31,12 @@ HistoryService* HistoryServiceFactory::GetForProfile(
}
// static
-HistoryService*
-HistoryServiceFactory::GetForProfileIfExists(
- Profile* profile, Profile::ServiceAccessType sat) {
+HistoryService* HistoryServiceFactory::GetForProfileIfExists(
+ Profile* profile,
+ ServiceAccessType sat) {
// If saving history is disabled, only allow explicit access.
if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) &&
- sat != Profile::EXPLICIT_ACCESS)
+ sat != ServiceAccessType::EXPLICIT_ACCESS)
return NULL;
return static_cast<HistoryService*>(
« no previous file with comments | « chrome/browser/history/history_service_factory.h ('k') | chrome/browser/history/history_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698