New avatar button: Consolidate text elision between Mac and Win/Linux

ui/views/corewm/tooltip_aura.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/tooltip_aura.h"
 
 #include "base/strings/string_split.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 99 matching lines @@
       line.append(word);
     }
     result_lines.push_back(line);
   }
 
   // Clamp number of lines to |kMaxLines|.
   if (result_lines.size() > kMaxLines) {
     result_lines.resize(kMaxLines);
     // Add ellipses character to last line.
     result_lines[kMaxLines - 1] = gfx::TruncateString(
-        result_lines.back(), result_lines.back().length() - 1);
+        result_lines.back(), result_lines.back().length() - 1, gfx::WORD_BREAK);
   }
   *line_count = result_lines.size();
 
   // Flatten the result.
   base::string16 result;
   for (std::vector<base::string16>::iterator l = result_lines.begin();
       l != result_lines.end(); ++l) {
     if (!result.empty())
       result.push_back('\n');
     int line_width = gfx::GetStringWidth(*l, font_list);
@@ skipping 105 matching lines @@
 }
 
 void TooltipAura::OnWidgetDestroying(views::Widget* widget) {
   DCHECK_EQ(widget_, widget);
   widget_ = NULL;
   tooltip_window_ = NULL;
 }
 
 }  // namespace corewm
 }  // namespace views