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

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.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
Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
===================================================================
--- chrome/browser/ui/content_settings/content_setting_bubble_model.cc (revision 82762)
+++ chrome/browser/ui/content_settings/content_setting_bubble_model.cc (working copy)
@@ -206,11 +206,11 @@
// content type and setting the default value based on the content setting.
void SetRadioGroup() {
GURL url = tab_contents()->tab_contents()->GetURL();
- std::wstring display_host_wide;
+ string16 display_host_utf16;
net::AppendFormattedHost(url,
- UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)),
- &display_host_wide, NULL, NULL);
- std::string display_host(WideToUTF8(display_host_wide));
+ profile()->GetPrefs()->GetString(prefs::kAcceptLanguages),
+ &display_host_utf16);
+ std::string display_host(UTF16ToUTF8(display_host_utf16));
if (display_host.empty())
display_host = url.spec();

Powered by Google App Engine
This is Rietveld 408576698