diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 19:10:29 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 19:10:29 +0000 |
| commit | d686e81c3aa69628c73807304245640f12a42366 (patch) | |
| tree | d464692cd4c9415e68f2813fa786492282128e2e /chrome | |
| parent | a0e692672ede62f71cfaa159cfd90990cb3f860a (diff) | |
| download | chromium_src-d686e81c3aa69628c73807304245640f12a42366.zip chromium_src-d686e81c3aa69628c73807304245640f12a42366.tar.gz chromium_src-d686e81c3aa69628c73807304245640f12a42366.tar.bz2 | |
Shows IDN for "Waiting for <host-name>..." message when Chrome is waiting for a
server response.
TEST=Adds "ja" to Accept-Language, accesses
http://www.xn--w22as22a.haun.org/empty.pl, which takes 10 seconds to response,
and confirms "Waiting for ..." message has Unicode host name.
BUG=3991
Original review URL: http://codereview.chromium.org/118070
Patch by tkent@google.com
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index db05c00..3e15f10 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -52,6 +52,7 @@ #include "grit/locale_settings.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" +#include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" #if defined(OS_WIN) @@ -2286,7 +2287,11 @@ void TabContents::RendererResponsive(RenderViewHost* render_view_host) { void TabContents::LoadStateChanged(const GURL& url, net::LoadState load_state) { load_state_ = load_state; - load_state_host_ = UTF8ToWide(url.host()); + std::wstring languages = + profile()->GetPrefs()->GetString(prefs::kAcceptLanguages); + load_state_host_.clear(); + std::string host = url.host(); + net::IDNToUnicode(host.c_str(), host.size(), languages, &load_state_host_); if (load_state_ == net::LOAD_STATE_READING_RESPONSE) SetNotWaitingForResponse(); if (is_loading()) |