diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 21:38:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 21:38:54 +0000 |
| commit | e3cc52018a52135221bf68d330ed81f61eb8982b (patch) | |
| tree | e01b9c98dd2b9911eec2dbe697c26f479543da6a /content | |
| parent | ceb5362e6702443f62a301bbc4ca1593b8fd9859 (diff) | |
| download | chromium_src-e3cc52018a52135221bf68d330ed81f61eb8982b.zip chromium_src-e3cc52018a52135221bf68d330ed81f61eb8982b.tar.gz chromium_src-e3cc52018a52135221bf68d330ed81f61eb8982b.tar.bz2 | |
Convert ElideString to use string16 instead of wstring.
BUG=23581
Review URL: http://codereview.chromium.org/6526027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/tab_contents/navigation_entry.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/browser/tab_contents/navigation_entry.cc b/content/browser/tab_contents/navigation_entry.cc index 147461b..989c5ec 100644 --- a/content/browser/tab_contents/navigation_entry.cc +++ b/content/browser/tab_contents/navigation_entry.cc @@ -89,15 +89,12 @@ const string16& NavigationEntry::GetTitleForDisplay( // Use the virtual URL first if any, and fall back on using the real URL. string16 title; - std::wstring elided_title; if (!virtual_url_.is_empty()) { title = net::FormatUrl(virtual_url_, languages); } else if (!url_.is_empty()) { title = net::FormatUrl(url_, languages); } - ui::ElideString(UTF16ToWideHack(title), chrome::kMaxTitleChars, - &elided_title); - cached_display_title_ = WideToUTF16Hack(elided_title); + ui::ElideString(title, chrome::kMaxTitleChars, &cached_display_title_); return cached_display_title_; } |