Revert of Use labels to display views tab titles.

ui/views/controls/message_box_view.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/message_box_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 159 matching lines @@
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, private:
 
 void MessageBoxView::Init(const InitParams& params) {
   if (params.options & DETECT_DIRECTIONALITY) {
     std::vector<base::string16> texts;
     SplitStringIntoParagraphs(params.message, &texts);
+    // If the text originates from a web page, its alignment is based on its
+    // first character with strong directionality.
+    base::i18n::TextDirection message_direction =
+        base::i18n::GetFirstStrongCharacterDirection(params.message);
+    gfx::HorizontalAlignment alignment =
+        (message_direction == base::i18n::RIGHT_TO_LEFT) ?
+        gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
     for (size_t i = 0; i < texts.size(); ++i) {
       Label* message_label = new Label(texts[i]);
-      // Avoid empty multi-line labels, which have a height of 0.
+      // Don't set multi-line to true if the text is empty, else the label will
+      // have a height of 0.
       message_label->SetMultiLine(!texts[i].empty());
       message_label->SetAllowCharacterBreak(true);
-      message_label->set_directionality_mode(gfx::DIRECTIONALITY_FROM_TEXT);
-      message_label->SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
+      message_label->set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
+      message_label->SetHorizontalAlignment(alignment);
       message_labels_.push_back(message_label);
     }
   } else {
     Label* message_label = new Label(params.message);
     message_label->SetMultiLine(true);
     message_label->SetAllowCharacterBreak(true);
     message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_labels_.push_back(message_label);
   }
 
@@ skipping 65 matching lines @@
   }
 
   if (link_) {
     layout->AddPaddingRow(0, inter_row_vertical_spacing_);
     layout->StartRow(0, extra_column_view_set_id);
     layout->AddView(link_);
   }
 }
 
 }  // namespace views