diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 20:03:50 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 20:03:50 +0000 |
| commit | 04866c4c67566d17cdea2e72eb90a6ec79db1a8b (patch) | |
| tree | 0e14e8c1fa5bd77b6cba9b44b110426ec596be57 /content | |
| parent | 623fe74c6c07104c2f09b9822af47813a81d2f1f (diff) | |
| download | chromium_src-04866c4c67566d17cdea2e72eb90a6ec79db1a8b.zip chromium_src-04866c4c67566d17cdea2e72eb90a6ec79db1a8b.tar.gz chromium_src-04866c4c67566d17cdea2e72eb90a6ec79db1a8b.tar.bz2 | |
Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_util.h, and reduce the API surfaces in various places slightly where possible.
BUG=23581
TEST=none
Review URL: http://codereview.chromium.org/6898026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index ef94e78..624691b 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -2091,11 +2091,8 @@ void TabContents::LoadStateChanged(const GURL& url, load_state_ = load_state; upload_position_ = upload_position; upload_size_ = upload_size; - std::wstring languages = - UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)); - std::string host = url.host(); - load_state_host_ = WideToUTF16Hack( - net::IDNToUnicode(host.c_str(), host.size(), languages, NULL)); + load_state_host_ = net::IDNToUnicode(url.host(), + profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)); if (load_state_ == net::LOAD_STATE_READING_RESPONSE) SetNotWaitingForResponse(); if (is_loading()) |