summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc7
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())