aura: Long launcher tooltips should elide at end.

ui/views/controls/label.cc

 // Copyright (c) 2012 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 96 matching lines @@
   if (base::i18n::IsRTL() && (directionality_mode_ == USE_UI_DIRECTIONALITY) &&
       (alignment != ALIGN_CENTER))
     alignment = (alignment == ALIGN_LEFT) ? ALIGN_RIGHT : ALIGN_LEFT;
   if (horiz_alignment_ != alignment) {
     horiz_alignment_ = alignment;
     SchedulePaint();
   }
 }
 
 void Label::SetMultiLine(bool multi_line) {
-  DCHECK(!multi_line || !elide_in_middle_);
+  DCHECK(!multi_line || elide_behavior_ != ELIDE_IN_MIDDLE);
   if (multi_line != is_multi_line_) {
     is_multi_line_ = multi_line;
     text_size_valid_ = false;
     PreferredSizeChanged();
     SchedulePaint();
   }
 }
 
 void Label::SetAllowCharacterBreak(bool allow_character_break) {
   if (allow_character_break != allow_character_break_) {
     allow_character_break_ = allow_character_break;
     text_size_valid_ = false;
     PreferredSizeChanged();
     SchedulePaint();
   }
 }
 
-void Label::SetElideInMiddle(bool elide_in_middle) {
-  DCHECK(!elide_in_middle || !is_multi_line_);
-  if (elide_in_middle != elide_in_middle_) {
-    elide_in_middle_ = elide_in_middle;
+void Label::SetElideBehavior(ElideBehavior elide_behavior) {
+  DCHECK(elide_behavior != ELIDE_IN_MIDDLE || !is_multi_line_);
+  if (elide_behavior != elide_behavior_) {
+    elide_behavior_ = elide_behavior;
     text_size_valid_ = false;
     is_email_ = false;
     PreferredSizeChanged();
     SchedulePaint();
   }
 }
 
 void Label::SetTooltipText(const string16& tooltip_text) {
   tooltip_text_ = tooltip_text;
 }
@@ skipping 203 matching lines @@
       ui::NativeTheme::kColorId_LabelEnabledColor);
   requested_disabled_color_ = ui::NativeTheme::instance()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor);
   background_color_ = ui::NativeTheme::instance()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelBackgroundColor);
   auto_color_readability_ = true;
   RecalculateColors();
   horiz_alignment_ = ALIGN_CENTER;
   is_multi_line_ = false;
   allow_character_break_ = false;
-  elide_in_middle_ = false;
+  elide_behavior_ = NO_ELIDE;
   is_email_ = false;
   collapse_when_hidden_ = false;
   directionality_mode_ = USE_UI_DIRECTIONALITY;
   paint_as_focused_ = false;
   has_focus_border_ = false;
   enabled_shadow_color_ = 0;
   disabled_shadow_color_ = 0;
   shadow_offset_.SetPoint(1, 1);
   has_shadow_ = false;
 
@@ skipping 105 matching lines @@
   return bounds;
 }
 
 void Label::CalculateDrawStringParams(string16* paint_text,
                                       gfx::Rect* text_bounds,
                                       int* flags) const {
   DCHECK(paint_text && text_bounds && flags);
 
   if (is_email_) {
     *paint_text = ui::ElideEmail(text_, font_, GetAvailableRect().width());
-  } else if (elide_in_middle_) {
+  } else if (elide_behavior_ == ELIDE_IN_MIDDLE) {
     *paint_text = ui::ElideText(text_, font_, GetAvailableRect().width(),
                                 ui::ELIDE_IN_MIDDLE);
+  } else if (elide_behavior_ == ELIDE_AT_END) {
+    *paint_text = ui::ElideText(text_, font_, GetAvailableRect().width(),
+                                ui::ELIDE_AT_END);
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeDrawStringFlags();
 }
 
 }  // namespace views