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

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

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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
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 615457af61d5e2e69325f2b8526c560d7487c771..c33a7fa7d5cf890266f63d6fd7001f8c6571e563 100644
--- a/chrome/browser/history/history_service_factory.cc
+++ b/chrome/browser/history/history_service_factory.cc
@@ -21,7 +21,7 @@ HistoryService* HistoryServiceFactory::GetForProfile(
return NULL;
return static_cast<HistoryService*>(
- GetInstance()->GetServiceForProfile(profile, true));
+ GetInstance()->GetServiceForBrowserContext(profile, true));
}
// static
@@ -34,14 +34,14 @@ HistoryServiceFactory::GetForProfileIfExists(
return NULL;
return static_cast<HistoryService*>(
- GetInstance()->GetServiceForProfile(profile, false));
+ GetInstance()->GetServiceForBrowserContext(profile, false));
}
// static
HistoryService*
HistoryServiceFactory::GetForProfileWithoutCreating(Profile* profile) {
return static_cast<HistoryService*>(
- GetInstance()->GetServiceForProfile(profile, false));
+ GetInstance()->GetServiceForBrowserContext(profile, false));
}
// static
@@ -52,19 +52,19 @@ HistoryServiceFactory* HistoryServiceFactory::GetInstance() {
// static
void HistoryServiceFactory::ShutdownForProfile(Profile* profile) {
HistoryServiceFactory* factory = GetInstance();
- factory->ProfileDestroyed(profile);
+ factory->BrowserContextDestroyed(profile);
}
HistoryServiceFactory::HistoryServiceFactory()
- : ProfileKeyedServiceFactory(
- "HistoryService", ProfileDependencyManager::GetInstance()) {
+ : BrowserContextKeyedServiceFactory(
+ "HistoryService", BrowserContextDependencyManager::GetInstance()) {
DependsOn(BookmarkModelFactory::GetInstance());
}
HistoryServiceFactory::~HistoryServiceFactory() {
}
-ProfileKeyedService*
+BrowserContextKeyedService*
HistoryServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* profile = static_cast<Profile*>(context);

Powered by Google App Engine
This is Rietveld 408576698