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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 7484072: Migrate geolocation settings to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 5 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/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index dbb77d5c1cdf7a82a155b7e67ac90f2411c6df15..e53bf4eed521166c45f4a3d36c7425e0152caa59 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -4,6 +4,10 @@
#include "chrome/browser/profiles/profile_impl.h"
+#include <list>
+#include <utility>
+#include <vector>
+
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/environment.h"
@@ -39,7 +43,6 @@
#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/favicon/favicon_service.h"
#include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
-#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/shortcuts_backend.h"
#include "chrome/browser/history/top_sites.h"
@@ -1049,12 +1052,6 @@ HostZoomMap* ProfileImpl::GetHostZoomMap() {
return host_zoom_map_.get();
}
-GeolocationContentSettingsMap* ProfileImpl::GetGeolocationContentSettingsMap() {
- if (!geolocation_content_settings_map_.get())
- geolocation_content_settings_map_ = new GeolocationContentSettingsMap(this);
- return geolocation_content_settings_map_.get();
-}
-
GeolocationPermissionContext* ProfileImpl::GetGeolocationPermissionContext() {
if (!geolocation_permission_context_.get())
geolocation_permission_context_ =

Powered by Google App Engine
This is Rietveld 408576698