diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 17:46:12 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 17:46:12 +0000 |
| commit | 89440824cd6ef0f9cf3a286c8aa55e916ab20aa6 (patch) | |
| tree | f367bcec30e471b7292d25ce155fc7e86380ada7 /chrome/browser/content_setting_bubble_model.cc | |
| parent | 9e2f65a4250e757b6e3afb8b3b46ae24c2ab76d6 (diff) | |
| download | chromium_src-89440824cd6ef0f9cf3a286c8aa55e916ab20aa6.zip chromium_src-89440824cd6ef0f9cf3a286c8aa55e916ab20aa6.tar.gz chromium_src-89440824cd6ef0f9cf3a286c8aa55e916ab20aa6.tar.bz2 | |
Fix IDN urls in geolocation infobars and bubbles (but not exceptions dialog)
BUG=40278
TEST=As per adhoc method in the bug. Open infobar & bubble, check they show URL in arabic
Review URL: http://codereview.chromium.org/1612017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_setting_bubble_model.cc')
| -rw-r--r-- | chrome/browser/content_setting_bubble_model.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc index 8cf0930..6c01be3 100644 --- a/chrome/browser/content_setting_bubble_model.cc +++ b/chrome/browser/content_setting_bubble_model.cc @@ -19,7 +19,7 @@ class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel { public: - ContentSettingTitleAndLinkModel(TabContents* tab_contents, Profile* profile, + ContentSettingTitleAndLinkModel(TabContents* tab_contents, Profile* profile, ContentSettingsType content_type) : ContentSettingBubbleModel(tab_contents, profile, content_type) { SetTitle(); @@ -206,7 +206,11 @@ class ContentSettingDomainListBubbleModel DomainList domains[CONTENT_SETTING_NUM_SETTINGS]; for (TabContents::GeolocationContentSettings::const_iterator it = settings.begin(); it != settings.end(); ++it) { - domains[it->second].hosts.insert(it->first.host()); + std::wstring display_host_wide; + net::AppendFormattedHost(it->first, + profile()->GetPrefs()->GetString(prefs::kAcceptLanguages), + &display_host_wide, NULL, NULL); + domains[it->second].hosts.insert(WideToUTF8(display_host_wide)); const ContentSetting saved_setting = settings_map->GetContentSetting(it->first, embedder_url); if (saved_setting != default_setting) |