Uses and returns the fractional width in text eliding

ui/views/widget/tooltip_manager.cc

Index: ui/views/widget/tooltip_manager.cc
diff --git a/ui/views/widget/tooltip_manager.cc b/ui/views/widget/tooltip_manager.cc
index 7eb497876414050988535664288c09c614c058fa..5f6063bc497ef2512f2a56194839be1a1c0fd16b 100644
--- a/ui/views/widget/tooltip_manager.cc
+++ b/ui/views/widget/tooltip_manager.cc
@@ -18,6 +18,7 @@ const size_t kMaxTooltipLength = 1024;
 // Maximum number of lines we allow in the tooltip.
 const size_t kMaxLines = 6;
 
+

[msw, 2013/10/01 02:42:48]

nit: remove this blank line

[jianli, 2013/10/01 18:56:50]

Done.

 namespace views {
 
 // static
@@ -52,8 +53,8 @@ void TooltipManager::TrimTooltipToFit(string16* text,
        ++i) {
     string16 elided_text =
         gfx::ElideText(*i, font_list, available_width, gfx::ELIDE_AT_END);
-    *max_width = std::max(*max_width,
-                          gfx::GetStringWidth(elided_text, font_list));
+    *max_width = std::max<int>(
+        *max_width, gfx::GetStringWidth(elided_text, font_list));
     if (!result.empty())
       result.push_back('\n');
     result.append(elided_text);