Prepare to use gfx::RenderText in views::Label.

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 164 matching lines @@
   int height = GetSizeForWidthAndLines(width(), lines).height();
   if (height > 0) {
     gfx::Rect bounds(width(), height);
     bounds.Inset(owner_->GetInsets());
     if (bounds.width() != wrapped_text_width_ || lines != wrapped_text_lines_) {
       wrapped_text_ = JoinString(GetWrappedText(bounds.width(), lines), '\n');
       wrapped_text_width_ = bounds.width();
       wrapped_text_lines_ = lines;
     }
     bounds.set_x(GetMirroredXForRect(bounds));
-    PaintText(canvas, wrapped_text_, bounds, GetTextFlags());
+    canvas->DrawStringRectWithFlags(
+        wrapped_text_, font_list(), enabled_color(), bounds, GetTextFlags());
   }
 }
 
 void InnerBoundedLabel::SetText(const base::string16& text) {
   views::Label::SetText(text);
   ClearCaches();
 }
 
 int InnerBoundedLabel::GetTextFlags() {
   int flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::CHARACTER_BREAK;
 
   // We can't use subpixel rendering if the background is non-opaque.
   if (SkColorGetA(background_color()) != 0xFF)
     flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
 
-  if (directionality_mode() == gfx::DIRECTIONALITY_FORCE_LTR) {
-    flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-  } else if (directionality_mode() == gfx::DIRECTIONALITY_FORCE_RTL) {
-    flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
-  } else if (directionality_mode() == gfx::DIRECTIONALITY_FROM_TEXT) {
-    base::i18n::TextDirection direction =
-        base::i18n::GetFirstStrongCharacterDirection(text());
-    if (direction == base::i18n::RIGHT_TO_LEFT)
-      flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
-    else
-      flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-  }
-
-  return flags;
+  const base::i18n::TextDirection direction =
+      base::i18n::GetFirstStrongCharacterDirection(text());
+  if (direction == base::i18n::RIGHT_TO_LEFT)
+    return flags | gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
+  return flags | gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
 }
 
 void InnerBoundedLabel::ClearCaches() {
   wrapped_text_width_ = 0;
   wrapped_text_lines_ = 0;
   lines_cache_.clear();
   lines_widths_.clear();
   size_cache_.clear();
   size_widths_and_lines_.clear();
 }
@@ skipping 126 matching lines @@
 
 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