Convert gfx::ElideText from using wstrings to string16.

BUG=23581

Review URL: http://codereview.chromium.org/3885003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63433 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 2 deletions

diff --git a/views/controls/label.cc b/views/controls/label.cc
index 6d979df..dcff7c8 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -437,7 +437,8 @@ void Label::CalculateDrawStringParams(std::wstring* paint_text,
     *paint_text = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
         WideToUTF16(*paint_text)));
   } else if (elide_in_middle_) {
-    *paint_text = gfx::ElideText(text_, font_, width(), true);
+    *paint_text = UTF16ToWideHack(gfx::ElideText(WideToUTF16Hack(text_),
+        font_, width(), true));
   } else {
     *paint_text = text_;
   }
diff --git a/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc
index 39ccab8..5c400eb9 100644
--- a/views/widget/tooltip_manager.cc
+++ b/views/widget/tooltip_manager.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "app/text_elider.h"
+#include "base/utf_string_conversions.h"
 
 namespace views {
 
@@ -57,7 +58,8 @@ void TooltipManager::TrimTooltipToFit(std::wstring* text,
   std::wstring result;
   for (std::vector<std::wstring>::iterator i = lines.begin(); i != lines.end();
        ++i) {
-    std::wstring elided_text = gfx::ElideText(*i, font, available_width, false);
+    std::wstring elided_text = UTF16ToWideHack(gfx::ElideText(WideToUTF16Hack(
+        *i), font, available_width, false));
     *max_width = std::max(*max_width, font.GetStringWidth(elided_text));
     if (i == lines.begin() && i + 1 == lines.end()) {
       *text = elided_text;