Review request: fix issue 6099 -- bad display of multi-line English message in pop ups

chrome/views/label.cc

 // Copyright (c) 2006-2008 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 "chrome/views/label.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 27 matching lines @@
 void Label::Init(const std::wstring& text, const ChromeFont& font) {
   contains_mouse_ = false;
   font_ = font;
   text_size_valid_ = false;
   SetText(text);
   url_set_ = false;
   color_ = kEnabledColor;
   horiz_alignment_ = ALIGN_CENTER;
   is_multi_line_ = false;
   collapse_when_hidden_ = false;
+  rtl_alignment_mode_ = USE_UI_ALIGNMENT;
 }
 
 Label::~Label() {
 }
 
 gfx::Size Label::GetPreferredSize() {
   gfx::Size prefsize;
 
   // Return a size of (0, 0) if the label is not visible and if the
   // collapse_when_hidden_ flag is set.
@@ skipping 173 matching lines @@
 
 void Label::SetColor(const SkColor& color) {
   color_ = color;
 }
 
 const SkColor Label::GetColor() const {
   return color_;
 }
 
 void Label::SetHorizontalAlignment(Alignment a) {
+  // If the View's UI layout is right-to-left and rtl_alignment_mode_ is
+  // USE_UI_ALIGNMENT, we need to flip the alignment so that the alignment
+  // settings take into account the text directionality.
+  if (UILayoutIsRightToLeft() && rtl_alignment_mode_ == USE_UI_ALIGNMENT) {
+    if (a == ALIGN_LEFT)
+      a = ALIGN_RIGHT;
+    else if (a == ALIGN_RIGHT)
+      a = ALIGN_LEFT;
+  }
   if (horiz_alignment_ != a) {
-
-    // If the View's UI layout is right-to-left, we need to flip the alignment
-    // so that the alignment settings take into account the text
-    // directionality.
-    if (UILayoutIsRightToLeft()) {
-      if (a == ALIGN_LEFT)
-        a = ALIGN_RIGHT;
-      else if (a == ALIGN_RIGHT)
-        a = ALIGN_LEFT;
-    }
     horiz_alignment_ = a;
     SchedulePaint();
   }
 }
 
 Label::Alignment Label::GetHorizontalAlignment() const {
   return horiz_alignment_;
 }
 
+void Label::SetRTLAlignmentMode(RTLAlignmentMode mode) {
+  rtl_alignment_mode_ = mode;
+}
+
+Label::RTLAlignmentMode Label::GetRTLAlignmentMode() const {
+  return rtl_alignment_mode_;
+}
+
 void Label::SetMultiLine(bool f) {
   if (f != is_multi_line_) {
     is_multi_line_ = f;
     SchedulePaint();
   }
 }
 
 bool Label::IsMultiLine() {
   return is_multi_line_;
 }
@@ skipping 131 matching lines @@
 
 bool Label::GetAccessibleState(VARIANT* state) {
   DCHECK(state);
 
   state->lVal |= STATE_SYSTEM_READONLY;
   return true;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace views