diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:07:35 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:07:35 +0000 |
| commit | 19bcbfa963214916a9cd6958fac9487b48cbd071 (patch) | |
| tree | 6b2f7c7bd91214f980de7390051036d131cb1e8b /chrome/browser/geolocation | |
| parent | 2f19a2efcd04eefd8b5c2da41bf1d0ceff852fb6 (diff) | |
| download | chromium_src-19bcbfa963214916a9cd6958fac9487b48cbd071.zip chromium_src-19bcbfa963214916a9cd6958fac9487b48cbd071.tar.gz chromium_src-19bcbfa963214916a9cd6958fac9487b48cbd071.tar.bz2 | |
Remove (deprecated) wstring version of DictionaryValue::RemoveWithoutPathExpansion().
(And convert the few remaining uses.)
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3163011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_content_settings_map.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc index 77fb103..597d408 100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc @@ -129,8 +129,6 @@ void GeolocationContentSettingsMap::SetContentSetting( GURL embedding_origin(embedding_url.GetOrigin()); DCHECK(requesting_origin.is_valid()); DCHECK(embedding_origin.is_valid() || embedding_url.is_empty()); - std::wstring wide_requesting_origin(UTF8ToWide(requesting_origin.spec())); - std::wstring wide_embedding_origin(UTF8ToWide(embedding_origin.spec())); PrefService* prefs = profile_->GetPrefs(); DictionaryValue* all_settings_dictionary = prefs->GetMutableDictionary( prefs::kGeolocationContentSettings); @@ -139,24 +137,24 @@ void GeolocationContentSettingsMap::SetContentSetting( ScopedPrefUpdate update(prefs, prefs::kGeolocationContentSettings); DictionaryValue* requesting_origin_settings_dictionary = NULL; all_settings_dictionary->GetDictionaryWithoutPathExpansion( - wide_requesting_origin, &requesting_origin_settings_dictionary); + requesting_origin.spec(), &requesting_origin_settings_dictionary); if (setting == CONTENT_SETTING_DEFAULT) { if (requesting_origin_settings_dictionary) { requesting_origin_settings_dictionary->RemoveWithoutPathExpansion( - wide_embedding_origin, NULL); + embedding_origin.spec(), NULL); if (requesting_origin_settings_dictionary->empty()) all_settings_dictionary->RemoveWithoutPathExpansion( - wide_requesting_origin, NULL); + requesting_origin.spec(), NULL); } } else { if (!requesting_origin_settings_dictionary) { requesting_origin_settings_dictionary = new DictionaryValue; all_settings_dictionary->SetWithoutPathExpansion( - wide_requesting_origin, requesting_origin_settings_dictionary); + requesting_origin.spec(), requesting_origin_settings_dictionary); } DCHECK(requesting_origin_settings_dictionary); requesting_origin_settings_dictionary->SetWithoutPathExpansion( - wide_embedding_origin, Value::CreateIntegerValue(setting)); + embedding_origin.spec(), Value::CreateIntegerValue(setting)); } } |