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

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

Issue 3163015: Remove deprecated wstring DictionaryValue::Get{Dictionary,List}WithoutPathExpansion() overloads. (Closed)
Patch Set: Created 10 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
« no previous file with comments | « chrome/browser/background_contents_service_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/geolocation/geolocation_content_settings_map.cc
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc
index 597d408cd82f8df11bc25f904594453ae799ffd6..b9e84dc5ac749b8b95992b86271ba7afdf91affa 100644
--- a/chrome/browser/geolocation/geolocation_content_settings_map.cc
+++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc
@@ -67,7 +67,7 @@ ContentSetting GeolocationContentSettingsMap::GetContentSetting(
if (all_settings_dictionary != NULL) {
DictionaryValue* requesting_origin_settings;
if (all_settings_dictionary->GetDictionaryWithoutPathExpansion(
- UTF8ToWide(requesting_origin.spec()), &requesting_origin_settings)) {
+ requesting_origin.spec(), &requesting_origin_settings)) {
int setting;
if (requesting_origin_settings->GetIntegerWithoutPathExpansion(
UTF8ToWide(embedding_origin.spec()), &setting))
@@ -75,7 +75,7 @@ ContentSetting GeolocationContentSettingsMap::GetContentSetting(
// Check for any-embedder setting
if (requesting_origin != embedding_origin &&
requesting_origin_settings->GetIntegerWithoutPathExpansion(
- L"", &setting))
+ "", &setting))
return IntToContentSetting(setting);
}
}
« no previous file with comments | « chrome/browser/background_contents_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698