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

chrome/views/label.h

 // 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.
 
 #ifndef CHROME_VIEWS_LABEL_H__
 #define CHROME_VIEWS_LABEL_H__
 
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkColor.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace views {
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Label class
 //
 // A label is a view subclass that can display a string.
 //
 /////////////////////////////////////////////////////////////////////////////
 class Label : public View {
  public:
   enum Alignment { ALIGN_LEFT = 0,
                    ALIGN_CENTER,
                    ALIGN_RIGHT };
 
+  // The following enum is used to indicate whether using the Chrome UI's
+  // alignment as the label's alignment, or autodetecting the label's
+  // alignment.
+  //
+  // If the label text originates from the Chrome UI, we should use the Chrome
+  // UI's alignment as the label's alignment.
+  //
+  // If the text originates from a web page, the text's alignment is determined
+  // based on the first character with strong directionality, disregarding what
+  // directionality the Chrome UI is. And its alignment will not be flipped
+  // around in RTL locales.
+  enum RTLAlignmentMode {
+    USE_UI_ALIGNMENT = 0,
+    AUTO_DETECT_ALIGNMENT
+  };
+
   // The view class name.
   static const char kViewClassName[];
 
   // Create a new label with a default font and empty value
   Label();
 
   // Create a new label with a default font
   explicit Label(const std::wstring& text);
 
   Label(const std::wstring& text, const ChromeFont& font);
@@ skipping 35 matching lines @@
 
   // Return the label URL.
   const GURL GetURL() const;
 
   // Set the color
   virtual void SetColor(const SkColor& color);
 
   // Return a reference to the currently used color
   virtual const SkColor GetColor() const;
 
-  // Alignment
+  // Set horizontal alignment. If the locale is RTL, and the RTL alignment
+  // setting is set as USE_UI_ALIGNMENT, the alignment is flipped around.
+  //
+  // Caveat: for labels originating from a web page, the RTL alignment mode
+  // should be reset to AUTO_DETECT_ALIGNMENT before the horizontal alignment
+  // is set. Otherwise, the label's alignment specified as a parameter will be
+  // flipped in RTL locales. Please see the comments in SetRTLAlignmentMode for
+  // more information.
   void SetHorizontalAlignment(Alignment a);
+
   Alignment GetHorizontalAlignment() const;
 
+  // Set the RTL alignment mode. The RTL alignment mode is initialized to
+  // USE_UI_ALIGNMENT when the label is constructed. USE_UI_ALIGNMENT applies
+  // to every label that originates from the Chrome UI. However, if the label
+  // originates from a web page, its alignment should not be flipped around for
+  // RTL locales. For such labels, we need to set the RTL alignment mode to
+  // AUTO_DETECT_ALIGNMENT so that subsequent SetHorizontalAlignment() calls
+  // will not flip the label's alignment around.
+  void SetRTLAlignmentMode(RTLAlignmentMode mode);
+
+  RTLAlignmentMode GetRTLAlignmentMode() const;
+
   // Set whether the label text can wrap on multiple lines.
   // Default is false
   void SetMultiLine(bool f);
 
   // Return whether the label text can wrap on multiple lines
   bool IsMultiLine();
 
   // Sets the tooltip text.  Default behavior for a label (single-line) is to
   // show the full text if it is wider than its bounds.  Calling this overrides
   // the default behavior and lets you set a custom tooltip.  To revert to
@@ skipping 87 matching lines @@
   bool text_size_valid_;
   bool is_multi_line_;
   bool url_set_;
   Alignment horiz_alignment_;
   std::wstring tooltip_text_;
   // Whether the mouse is over this label.
   bool contains_mouse_;
   scoped_ptr<Background> mouse_over_background_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
+  // The following member variable is used to control whether the alignment
+  // needs to be flipped around for RTL locales. Please refer to the definition
+  // of RTLAlignmentMode for more information.
+  RTLAlignmentMode rtl_alignment_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // CHROME_VIEWS_VIEW_H__