Change signature of |ui::ElideText()|. Add a truncate mode.

ui/views/controls/label.cc

 // Copyright (c) 2011 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/controls/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 467 matching lines @@
     // Hebrew or Arabic characters are displayed correctly.
     //
     // Note that we don't check the View's UI layout setting in order to
     // determine whether or not to insert the special Unicode formatting
     // characters. We use the locale settings because an URL is always treated
     // as an LTR string, even if its containing view does not use an RTL UI
     // layout.
     *paint_text = base::i18n::GetDisplayStringInLTRDirectionality(
         *paint_text);
   } else if (elide_in_middle_) {
-    *paint_text = ui::ElideText(text_,
-        font_, GetAvailableRect().width(), true);
+    *paint_text = ui::ElideText(text_, font_, GetAvailableRect().width(),
+                                ui::ELIDE_IN_MIDDLE);
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
   // If rtl_alignment_mode_ is AUTO_DETECT_ALIGNMENT (such as for text from
   // webpage, not from chrome's UI), its directionality is forced to be RTL if
   // it is right aligned. Otherwise, its directionality is forced to be LTR.
   if (rtl_alignment_mode_ == AUTO_DETECT_ALIGNMENT) {
     if (horiz_alignment_ == ALIGN_RIGHT)
       *flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
     else
       *flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
   }
 }
 
 }  // namespace views