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

Unified Diff: chrome/browser/autocomplete/autocomplete.cc

Issue 115346: Convert Punycode domains to Unicode in URLs shown in the followings:... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 7 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 | « app/gfx/text_elider.cc ('k') | chrome/browser/autocomplete/history_url_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete.cc (revision 16437)
+++ chrome/browser/autocomplete/autocomplete.cc (working copy)
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "app/gfx/text_elider.h"
#include "app/l10n_util.h"
#include "base/basictypes.h"
#include "base/string_util.h"
@@ -492,9 +491,9 @@
std::wstring AutocompleteProvider::StringForURLDisplay(
const GURL& url,
bool check_accept_lang) const {
- return gfx::GetCleanStringFromUrl(url, (check_accept_lang && profile_) ?
- profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::wstring(),
- NULL, NULL);
+ std::wstring languages = (check_accept_lang && profile_) ?
+ profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::wstring();
+ return net::FormatUrl(url, languages);
}
// AutocompleteResult ---------------------------------------------------------
« no previous file with comments | « app/gfx/text_elider.cc ('k') | chrome/browser/autocomplete/history_url_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698