Revert of Use labels to display views tab titles.

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 102 matching lines @@
 
 void Label::SetShadowOffset(int x, int y) {
   shadow_offset_.SetPoint(x, y);
 }
 
 void Label::ClearEmbellishing() {
   has_shadow_ = false;
 }
 
 void Label::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
-  // If the UI layout is right-to-left, flip the alignment direction.
-  if (base::i18n::IsRTL() &&
-      (alignment == gfx::ALIGN_LEFT || alignment == gfx::ALIGN_RIGHT)) {
+  // If the View's UI layout is right-to-left and directionality_mode_ is
+  // USE_UI_DIRECTIONALITY, we need to flip the alignment so that the alignment
+  // settings take into account the text directionality.
+  if (base::i18n::IsRTL() && (directionality_mode_ == USE_UI_DIRECTIONALITY) &&
+      (alignment != gfx::ALIGN_CENTER)) {
     alignment = (alignment == gfx::ALIGN_LEFT) ?
         gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
   }
   if (horizontal_alignment_ != alignment) {
     horizontal_alignment_ = alignment;
     SchedulePaint();
   }
 }
 
-gfx::HorizontalAlignment Label::GetHorizontalAlignment() const {
-  if (horizontal_alignment_ != gfx::ALIGN_TO_HEAD)
-    return horizontal_alignment_;
-
-  const base::i18n::TextDirection dir =
-      base::i18n::GetFirstStrongCharacterDirection(layout_text());
-  return dir == base::i18n::RIGHT_TO_LEFT ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
-}
-
 void Label::SetLineHeight(int height) {
   if (height != line_height_) {
     line_height_ = height;
     ResetCachedSize();
     PreferredSizeChanged();
     SchedulePaint();
   }
 }
 
 void Label::SetMultiLine(bool multi_line) {
@@ skipping 251 matching lines @@
   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;
   is_obscured_ = false;
   allow_character_break_ = false;
   elide_behavior_ = gfx::ELIDE_TAIL;
   collapse_when_hidden_ = false;
-  directionality_mode_ = gfx::DIRECTIONALITY_FROM_UI;
+  directionality_mode_ = USE_UI_DIRECTIONALITY;
   enabled_shadow_color_ = 0;
   disabled_shadow_color_ = 0;
   shadow_offset_.SetPoint(1, 1);
   has_shadow_ = false;
   shadow_blur_ = 0;
   halo_color_ = SK_ColorTRANSPARENT;
   cached_heights_.resize(kCachedSizeLimit);
   ResetCachedSize();
 
   SetText(text);
 }
 
 void Label::RecalculateColors() {
   actual_enabled_color_ = auto_color_readability_ ?
       color_utils::GetReadableColor(requested_enabled_color_,
                                     background_color_) :
       requested_enabled_color_;
   actual_disabled_color_ = auto_color_readability_ ?
       color_utils::GetReadableColor(requested_disabled_color_,
                                     background_color_) :
       requested_disabled_color_;
 }
 
 gfx::Rect Label::GetTextBounds() const {
-  gfx::Rect available(GetAvailableRect());
+  gfx::Rect available_rect(GetAvailableRect());
   gfx::Size text_size(GetTextSize());
-  text_size.set_width(std::min(available.width(), text_size.width()));
-  gfx::Point origin(GetInsets().left(), GetInsets().top());
-  switch (GetHorizontalAlignment()) {
+  text_size.set_width(std::min(available_rect.width(), text_size.width()));
+
+  gfx::Insets insets = GetInsets();
+  gfx::Point text_origin(insets.left(), insets.top());
+  switch (horizontal_alignment_) {
     case gfx::ALIGN_LEFT:
       break;
     case gfx::ALIGN_CENTER:
-      // Put any extra margin pixel on the left to match the legacy behavior
-      // from the use of GetTextExtentPoint32() on Windows.
-      origin.Offset((available.width() + 1 - text_size.width()) / 2, 0);
+      // We put any extra margin pixel on the left rather than the right.  We
+      // used to do this because measurement on Windows used
+      // GetTextExtentPoint32(), which could report a value one too large on the
+      // right; we now use DrawText(), and who knows if it can also do this.
+      text_origin.Offset((available_rect.width() + 1 - text_size.width()) / 2,
+                         0);
       break;
     case gfx::ALIGN_RIGHT:
-      origin.set_x(available.right() - text_size.width());
+      text_origin.set_x(available_rect.right() - text_size.width());
       break;
     default:
       NOTREACHED();
       break;
   }
-  origin.Offset(0, std::max(0, (available.height() - text_size.height())) / 2);
-  return gfx::Rect(origin, text_size);
+  text_origin.Offset(0,
+      std::max(0, (available_rect.height() - text_size.height())) / 2);
+  return gfx::Rect(text_origin, text_size);
 }
 
 int Label::ComputeDrawStringFlags() const {
   int flags = 0;
 
   // 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) {
+  if (directionality_mode_ == AUTO_DETECT_DIRECTIONALITY) {
     base::i18n::TextDirection direction =
         base::i18n::GetFirstStrongCharacterDirection(layout_text());
     if (direction == base::i18n::RIGHT_TO_LEFT)
       flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
     else
       flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
   }
 
-  switch (GetHorizontalAlignment()) {
+  switch (horizontal_alignment_) {
     case gfx::ALIGN_LEFT:
       flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
       break;
     case gfx::ALIGN_CENTER:
       flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
       break;
     case gfx::ALIGN_RIGHT:
       flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
       break;
-    default:
-      NOTREACHED();
-      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
@@ skipping 57 matching lines @@
     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