request review: fix issue 2821 and 6132

chrome/browser/views/options/cookies_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 <algorithm>
 
 #include "chrome/browser/views/options/cookies_view.h"
 
 #include "base/string_util.h"
 #include "base/time_format.h"
@@ skipping 131 matching lines @@
 }
 
 std::wstring CookiesTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
   switch (column_id) {
     case IDS_COOKIES_DOMAIN_COLUMN_HEADER:
       {
         // Domain cookies start with a trailing dot, but we will show this
         // in the cookie details, show it without the dot in the list.
         std::string& domain = shown_cookies_.at(row)->first;
+        std::wstring wide_domain;
         if (!domain.empty() && domain[0] == '.')
-          return UTF8ToWide(domain.substr(1));
-        return UTF8ToWide(domain);
+          wide_domain = UTF8ToWide(domain.substr(1));
+        else
+          wide_domain = UTF8ToWide(domain);
+        // Force domain to be LTR
+        if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
+          l10n_util::WrapStringWithLTRFormatting(&wide_domain);
+        return wide_domain;
       }
       break;
-    case IDS_COOKIES_NAME_COLUMN_HEADER:
-      return UTF8ToWide(shown_cookies_.at(row)->second.Name());
+    case IDS_COOKIES_NAME_COLUMN_HEADER: {
+      std::wstring name = UTF8ToWide(shown_cookies_.at(row)->second.Name());
+      l10n_util::AdjustStringForLocaleDirection(name, &name);
+      return name;
       break;
+    }
   }
   NOTREACHED();
   return L"";
 }
 
 SkBitmap CookiesTableModel::GetIcon(int row) {
   static SkBitmap* icon = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_COOKIE_ICON);
   return *icon;
 }
@@ skipping 605 matching lines @@
 void CookiesView::ResetSearchQuery() {
   search_field_->SetText(EmptyWString());
   UpdateSearchResults();
 }
 
 void CookiesView::UpdateForEmptyState() {
   info_view_->ClearCookieDisplay();
   remove_button_->SetEnabled(false);
   remove_all_button_->SetEnabled(false);
 }