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

Unified Diff: chrome/browser/geolocation/geolocation_permission_context_factory.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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/geolocation/geolocation_permission_context_factory.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_factory.cc b/chrome/browser/geolocation/geolocation_permission_context_factory.cc
index 2fff431a3232460df742062674d43760d19164cb..27742b6b43d6ad76ccbc9c720c144d86cb76937a 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_factory.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_factory.cc
@@ -31,13 +31,13 @@ GeolocationPermissionContextFactory::GetInstance() {
#if !defined(OS_ANDROID)
GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
- : BrowserContextKeyedServiceFactory(
+ : PermissionContextFactoryBase(
"GeolocationPermissionContext",
BrowserContextDependencyManager::GetInstance()) {
}
#else
GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
- : BrowserContextKeyedServiceFactory(
+ : PermissionContextFactoryBase(
"GeolocationPermissionContextAndroid",
BrowserContextDependencyManager::GetInstance()) {
}
@@ -64,9 +64,3 @@ void GeolocationPermissionContextFactory::RegisterProfilePrefs(
registry->RegisterBooleanPref(prefs::kGeolocationEnabled, true);
#endif
}
-
-content::BrowserContext*
-GeolocationPermissionContextFactory::GetBrowserContextToUse(
- content::BrowserContext* context) const {
- return chrome::GetBrowserContextOwnInstanceInIncognito(context);
-}

Powered by Google App Engine
This is Rietveld 408576698