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

Unified Diff: chrome/browser/geolocation/geolocation_settings_state.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, 4 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_settings_state.cc
diff --git a/chrome/browser/geolocation/geolocation_settings_state.cc b/chrome/browser/geolocation/geolocation_settings_state.cc
index b07436ee4fee1b12e24065b7545fd88a6ac0fd2d..d576396c9d5c5b2bb57bec519a2709be342116ce 100644
--- a/chrome/browser/geolocation/geolocation_settings_state.cc
+++ b/chrome/browser/geolocation/geolocation_settings_state.cc
@@ -9,7 +9,6 @@
#include "base/string_piece.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
@@ -87,8 +86,11 @@ void GeolocationSettingsState::GetDetailedInfo(
}
const ContentSetting saved_setting =
- profile_->GetGeolocationContentSettingsMap()->GetContentSetting(
- i->first, embedder_url_);
+ profile_->GetHostContentSettingsMap()->GetContentSetting(
+ i->first,
+ embedder_url_,
+ CONTENT_SETTINGS_TYPE_GEOLOCATION,
+ std::string());
if (saved_setting != default_setting)
*tab_state_flags |= TABSTATE_HAS_EXCEPTION;
if (saved_setting != i->second)

Powered by Google App Engine
This is Rietveld 408576698