request review: fix issue 2821 and 6132

chrome/browser/views/password_manager_view.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/browser/profile.h"
 #include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
@@ skipping 55 matching lines @@
   CancelLoginsQuery();
 }
 
 int PasswordManagerTableModel::RowCount() {
   return static_cast<int>(saved_signons_.size());
 }
 
 std::wstring PasswordManagerTableModel::GetText(int row,
                                                 int col_id) {
   switch (col_id) {
-    case IDS_PASSWORD_MANAGER_VIEW_SITE_COLUMN:  // Site.
-      return saved_signons_[row]->display_url.display_url();
-    case IDS_PASSWORD_MANAGER_VIEW_USERNAME_COLUMN:  // Username.
-      return GetPasswordFormAt(row)->username_value;
+    case IDS_PASSWORD_MANAGER_VIEW_SITE_COLUMN: {  // Site.
+      const std::wstring& url = saved_signons_[row]->display_url.display_url();
+      // Force URL to have LTR directionality.
+      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+        std::wstring localized_url = url;
+        l10n_util::WrapStringWithLTRFormatting(&localized_url);
+        return localized_url;
+      }
+      return url;
+    }
+    case IDS_PASSWORD_MANAGER_VIEW_USERNAME_COLUMN: {  // Username.
+      std::wstring username = GetPasswordFormAt(row)->username_value;
+      l10n_util::AdjustStringForLocaleDirection(username, &username);
+      return username;
+    }
     default:
       NOTREACHED() << "Invalid column.";
       return std::wstring();
   }
 }
 
 int PasswordManagerTableModel::CompareValues(int row1, int row2,
                                              int column_id) {
   if (column_id == IDS_PASSWORD_MANAGER_VIEW_SITE_COLUMN) {
     return saved_signons_[row1]->display_url.Compare(
@@ skipping 292 matching lines @@
   table_view_->SetModel(NULL);
 
   // Clear the static instance so the next time Show() is called, a new
   // instance is created.
   instance_ = NULL;
 }
 
 views::View* PasswordManagerView::GetContentsView() {
   return this;
 }