Make Label's NO_ELIDE setting actually not elide, and change the default

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 348 matching lines @@
 
 void Label::Init(const string16& text, const gfx::Font& font) {
   font_ = font;
   enabled_color_set_ = disabled_color_set_ = background_color_set_ = false;
   auto_color_readability_ = true;
   UpdateColorsFromTheme(ui::NativeTheme::instance());
   horizontal_alignment_ = gfx::ALIGN_CENTER;
   line_height_ = 0;
   is_multi_line_ = false;
   allow_character_break_ = false;
-  elide_behavior_ = NO_ELIDE;
+  elide_behavior_ = ELIDE_AT_END;
   collapse_when_hidden_ = false;
   directionality_mode_ = USE_UI_DIRECTIONALITY;
   has_focus_border_ = false;
   enabled_shadow_color_ = 0;
   disabled_shadow_color_ = 0;
   shadow_offset_.SetPoint(1, 1);
   has_shadow_ = false;
   cached_heights_.resize(kCachedSizeLimit);
   ResetCachedSize();
 
@@ skipping 91 matching lines @@
   gfx::Rect bounds(size());
   bounds.Inset(GetInsets());
   return bounds;
 }
 
 void Label::CalculateDrawStringParams(string16* paint_text,
                                       gfx::Rect* text_bounds,
                                       int* flags) const {
   DCHECK(paint_text && text_bounds && flags);
 
-  // TODO(msw): Use ElideRectangleText to support eliding multi-line text.
-  if (elide_behavior_ == ELIDE_AS_EMAIL) {
-    *paint_text = ui::ElideEmail(text_, font_, GetAvailableRect().width());
+  // TODO(msw): Use ElideRectangleText to support eliding multi-line text.  Once
+  // this is done, we can set NO_ELLIPSIS unconditionally at the bottom.
+  if (is_multi_line_ || (elide_behavior_ == NO_ELIDE)) {
+    *paint_text = text_;
   } 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_;
+    DCHECK_EQ(ELIDE_AS_EMAIL, elide_behavior_);
+    *paint_text = ui::ElideEmail(text_, font_, GetAvailableRect().width());
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeDrawStringFlags();
+  if (!is_multi_line_ || (elide_behavior_ == NO_ELIDE))
+     *flags |= gfx::Canvas::NO_ELLIPSIS;
 }
 
 void Label::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
   if (!enabled_color_set_) {
     requested_enabled_color_ = theme->GetSystemColor(
         ui::NativeTheme::kColorId_LabelEnabledColor);
   }
   if (!disabled_color_set_) {
     requested_disabled_color_ = theme->GetSystemColor(
         ui::NativeTheme::kColorId_LabelDisabledColor);
@@ skipping 11 matching lines @@
   for (int i = 0; i < kCachedSizeLimit; ++i)
     cached_heights_[i] = gfx::Size();
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   return !is_multi_line_ &&
       font_.GetStringWidth(text_) > GetAvailableRect().width();
 }
 
 }  // namespace views