request review: fix issue 2821 and 6132

chrome/browser/views/keyword_editor_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 "chrome/browser/views/keyword_editor_view.h"
 
 #include <vector>
 
 #include "base/gfx/png_decoder.h"
 #include "base/string_util.h"
@@ skipping 173 matching lines @@
 
 int TemplateURLTableModel::RowCount() {
   return static_cast<int>(entries_.size());
 }
 
 std::wstring TemplateURLTableModel::GetText(int row, int col_id) {
   DCHECK(row >= 0 && row < RowCount());
   const TemplateURL& url = entries_[row]->template_url();
 
   switch (col_id) {
-    case IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN:
+    case IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN: {
+      std::wstring url_short_name = url.short_name();
+      // TODO(xji): Consider adding a special case if the short name is a URL,
+      // since those should always be displayed LTR. Please refer to
+      // http://crbug.com/6726 for more information.
+      l10n_util::AdjustStringForLocaleDirection(url_short_name,
+                                                &url_short_name);
       return (template_url_model_->GetDefaultSearchProvider() == &url) ?
           l10n_util::GetStringF(IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE,
-                                url.short_name()) :
-          url.short_name();
+                                url_short_name) : url_short_name;
+    }
 
-    case IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN:
-      return url.keyword();
+    case IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN: {
+      const std::wstring& keyword = url.keyword();
+      // Keyword should be domain name. Force it to have LTR directionality.
+      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+        std::wstring localized_keyword = keyword;
+        l10n_util::WrapStringWithLTRFormatting(&localized_keyword);
+        return localized_keyword;
+      }
+      return keyword;
       break;
+    }
 
     default:
       NOTREACHED();
       return std::wstring();
   }
 }
 
 SkBitmap TemplateURLTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
   return entries_[row]->GetIcon();
@@ skipping 409 matching lines @@
   }
   const int new_index = table_model_->IndexOfTemplateURL(keyword);
   table_model_->NotifyChanged(new_index);
 
   // Make sure the new default is in the main group.
   table_model_->MoveToMainGroup(index);
 
   // And select it.
   table_view_->Select(table_model_->IndexOfTemplateURL(keyword));
 }