Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/tab_contents/tab_contents.cc

Issue 6898026: Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | net/base/escape.h » ('j') | net/base/net_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc (revision 82762)
+++ content/browser/tab_contents/tab_contents.cc (working copy)
@@ -2203,11 +2203,9 @@
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(host.c_str(), host.size(),
+ profile()->GetPrefs()->GetString(prefs::kAcceptLanguages));
if (load_state_ == net::LOAD_STATE_READING_RESPONSE)
SetNotWaitingForResponse();
if (is_loading())
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | net/base/escape.h » ('j') | net/base/net_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698