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

chrome/views/label_unittest.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 "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/border.h"
 #include "chrome/views/label.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 43 matching lines @@
   label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
   EXPECT_EQ(
       reverse_alignment ? Label::ALIGN_LEFT : Label::ALIGN_RIGHT,
       label.GetHorizontalAlignment());
   label.SetHorizontalAlignment(Label::ALIGN_LEFT);
   EXPECT_EQ(
       reverse_alignment ? Label::ALIGN_RIGHT : Label::ALIGN_LEFT,
       label.GetHorizontalAlignment());
   label.SetHorizontalAlignment(Label::ALIGN_CENTER);
   EXPECT_EQ(Label::ALIGN_CENTER, label.GetHorizontalAlignment());
+
+  // The label's alignment should not be flipped if the RTL alignment mode
+  // is AUTO_DETECT_ALIGNMENT.
+  label.SetRTLAlignmentMode(Label::AUTO_DETECT_ALIGNMENT);
+  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  EXPECT_EQ(Label::ALIGN_RIGHT, label.GetHorizontalAlignment());
+  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  EXPECT_EQ(Label::ALIGN_LEFT, label.GetHorizontalAlignment());
+  label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+  EXPECT_EQ(Label::ALIGN_CENTER, label.GetHorizontalAlignment());
+}
+
+TEST(LabelTest, RTLAlignmentModeProperty) {
+  Label label;
+  EXPECT_EQ(Label::USE_UI_ALIGNMENT, label.GetRTLAlignmentMode());
+
+  label.SetRTLAlignmentMode(Label::AUTO_DETECT_ALIGNMENT);
+  EXPECT_EQ(Label::AUTO_DETECT_ALIGNMENT, label.GetRTLAlignmentMode());
+
+  label.SetRTLAlignmentMode(Label::USE_UI_ALIGNMENT);
+  EXPECT_EQ(Label::USE_UI_ALIGNMENT, label.GetRTLAlignmentMode());
 }
 
 TEST(LabelTest, MultiLineProperty) {
   Label label;
   EXPECT_FALSE(label.IsMultiLine());
   label.SetMultiLine(true);
   EXPECT_TRUE(label.IsMultiLine());
   label.SetMultiLine(false);
   EXPECT_FALSE(label.IsMultiLine());
 }
@@ skipping 339 matching lines @@
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_STREQ(test_text.c_str(), paint_text.c_str());
   EXPECT_EQ(center_bounds.x() + border.left(), text_bounds.x());
   EXPECT_EQ(center_bounds.y() + border.top(), text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
   EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_CENTER, flags);
 }
 
 }  // namespace views