message center: Make BoundedLabel override OnPaint instead of Paint.

ui/message_center/views/bounded_label.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/message_center/views/bounded_label.h"
 
 #include <limits>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 27 matching lines @@
 
   void SetNativeTheme(const ui::NativeTheme* theme);
 
   // Pass in a -1 width to use the preferred width, a -1 limit to skip limits.
   int GetLinesForWidthAndLimit(int width, int limit);
   gfx::Size GetSizeForWidthAndLines(int width, int lines);
   std::vector<base::string16> GetWrappedText(int width, int lines);
 
   // Overridden from views::Label.
   void SetText(const base::string16& text) override;
+  void OnPaint(gfx::Canvas* canvas) override;
 
  protected:
   // Overridden from views::Label.
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
-  void OnPaint(gfx::Canvas* canvas) override;
 
  private:
   int GetTextFlags();
 
   void ClearCaches();
   int GetCachedLines(int width);
   void SetCachedLines(int width, int lines);
   gfx::Size GetCachedSize(const std::pair<int, int>& width_and_lines);
   void SetCachedSize(std::pair<int, int> width_and_lines, gfx::Size size);
 
@@ skipping 249 matching lines @@
 
 gfx::Size BoundedLabel::GetPreferredSize() const {
   return visible() ? label_->GetSizeForWidthAndLines(-1, -1) : gfx::Size();
 }
 
 int BoundedLabel::GetHeightForWidth(int width) const {
   return visible() ?
          label_->GetSizeForWidthAndLines(width, line_limit_).height() : 0;
 }
 
-void BoundedLabel::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) {
-  if (visible())
-    label_->Paint(canvas, cull_set);
+void BoundedLabel::OnPaint(gfx::Canvas* canvas) {
+  label_->OnPaint(canvas);
 }
 
 bool BoundedLabel::CanProcessEventsWithinSubtree() const {
   return label_->CanProcessEventsWithinSubtree();
 }
 
 void BoundedLabel::GetAccessibleState(ui::AXViewState* state) {
   label_->GetAccessibleState(state);
 }
 
 void BoundedLabel::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   label_->SetBoundsRect(bounds());
   views::View::OnBoundsChanged(previous_bounds);
 }
 
 void BoundedLabel::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   label_->SetNativeTheme(theme);
 }
 
 base::string16 BoundedLabel::GetWrappedTextForTest(int width, int lines) {
   return JoinString(label_->GetWrappedText(width, lines), '\n');
 }
 
 }  // namespace message_center