retry r266622:

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 360 matching lines @@
   OnPaintBorder(canvas);
 
   base::string16 paint_text;
   gfx::Rect text_bounds;
   int flags = 0;
   CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   PaintText(canvas, paint_text, text_bounds, flags);
 }
 
 void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  UpdateColorsFromTheme(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);
+  }
+  if (!background_color_set_) {
+    background_color_ = theme->GetSystemColor(
+        ui::NativeTheme::kColorId_LabelBackgroundColor);
+  }
+  RecalculateColors();
 }
 
 void Label::Init(const base::string16& text, const gfx::FontList& font_list) {
   font_list_ = font_list;
   enabled_color_set_ = disabled_color_set_ = background_color_set_ = false;
   auto_color_readability_ = true;
-  UpdateColorsFromTheme(ui::NativeTheme::instance());
+  OnNativeThemeChanged(ui::NativeTheme::instance());

[sky, 2014/04/28 23:22:15]

Won't this end up invoking a virtual function from the constructor?
Label::Label->Init->OnNativeThemeCHanged?

[Evan Stade, 2014/04/29 19:20:26]

Is that a problem in this case? AFAIK it will do what we expect (call
Label::OnNativeThemeChanged, and not SubclassedLabel::OnNativeThemeChanged or
View::OnNativeThemeChanged).

It seems it's against the style guide though[1] which I didn't realize. I'll
just revert this entire file.

[1]
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Doing_...

   horizontal_alignment_ = gfx::ALIGN_CENTER;
   line_height_ = 0;
   is_multi_line_ = false;
   is_obscured_ = false;
   allow_character_break_ = false;
   elide_behavior_ = ELIDE_AT_END;
   collapse_when_hidden_ = false;
   directionality_mode_ = USE_UI_DIRECTIONALITY;
   enabled_shadow_color_ = 0;
   disabled_shadow_color_ = 0;
@@ skipping 73 matching lines @@
     case gfx::ALIGN_RIGHT:
       flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
       break;
   }
 
   if (!is_multi_line_)
     return flags;
 
   flags |= gfx::Canvas::MULTI_LINE;
 #if !defined(OS_WIN)
-    // Don't elide multiline labels on Linux.
-    // Todo(davemoore): Do we depend on eliding multiline text?
-    // Pango insists on limiting the number of lines to one if text is
-    // elided. You can get around this if you can pass a maximum height
-    // but we don't currently have that data when we call the pango code.
-    flags |= gfx::Canvas::NO_ELLIPSIS;
+  // Don't elide multiline labels on Linux.
+  // Todo(davemoore): Do we depend on eliding multiline text?
+  // Pango insists on limiting the number of lines to one if text is
+  // elided. You can get around this if you can pass a maximum height
+  // but we don't currently have that data when we call the pango code.
+  flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   if (allow_character_break_)
     flags |= gfx::Canvas::CHARACTER_BREAK;
 
   return flags;
 }
 
 gfx::Rect Label::GetAvailableRect() const {
   gfx::Rect bounds(size());
   bounds.Inset(GetInsets());
@@ skipping 29 matching lines @@
     *paint_text =
         gfx::ElideEmail(layout_text(), font_list_, 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);
-  }
-  if (!background_color_set_) {
-    background_color_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelBackgroundColor);
-  }
-  RecalculateColors();
-}
-
 void Label::ResetCachedSize() {
   text_size_valid_ = false;
   cached_heights_cursor_ = 0;
   for (int i = 0; i < kCachedSizeLimit; ++i)
     cached_heights_[i] = gfx::Size();
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   return !is_multi_line_ && !is_obscured_ &&
          gfx::GetStringWidth(layout_text(), font_list_) >
              GetAvailableRect().width();
 }
 
 }  // namespace views