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

Unified Diff: chrome/browser/sessions/session_service_factory.h

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/sessions/session_service_factory.h
diff --git a/chrome/browser/sessions/session_service_factory.h b/chrome/browser/sessions/session_service_factory.h
index 9e72a58f186a41c162a76cfc5ee63519d5cdf4e7..a8661a5f1ca7fb4c9e715d0d89507ed22dfed94a 100644
--- a/chrome/browser/sessions/session_service_factory.h
+++ b/chrome/browser/sessions/session_service_factory.h
@@ -14,7 +14,7 @@ class Profile;
// Singleton that owns all SessionServices and associates them with
// Profiles. Listens for the Profile's destruction notification and cleans up
// the associated SessionService.
-class SessionServiceFactory : public ProfileKeyedServiceFactory {
+class SessionServiceFactory : public BrowserContextKeyedServiceFactory {
public:
// Returns the session service for |profile|. This may return NULL. If this
// profile supports a session service (it isn't incognito), and the session
@@ -40,8 +40,8 @@ class SessionServiceFactory : public ProfileKeyedServiceFactory {
// For test use: force setting of the session service for a given profile.
// This will delete a previous session service for this profile if it exists.
static void SetForTestProfile(Profile* profile, SessionService* service) {
- GetInstance()->ProfileShutdown(profile);
- GetInstance()->ProfileDestroyed(profile);
+ GetInstance()->BrowserContextShutdown(profile);
+ GetInstance()->BrowserContextDestroyed(profile);
GetInstance()->Associate(profile, service);
}
#endif
@@ -54,10 +54,10 @@ class SessionServiceFactory : public ProfileKeyedServiceFactory {
SessionServiceFactory();
virtual ~SessionServiceFactory();
- // ProfileKeyedServiceFactory:
- virtual ProfileKeyedService* BuildServiceInstanceFor(
+ // BrowserContextKeyedServiceFactory:
+ virtual BrowserContextKeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const OVERRIDE;
- virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
+ virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
};

Powered by Google App Engine
This is Rietveld 408576698