This CL fix issue 2674 - search engine name containing parenthesis is not displayed correctly in Omnibox

NavSuggest drop-down list.

The fix is to adjust the search engine name according to locale direction so that the search engine name containing parenthesis are marked with RLE-PDF to be displayed correctly in RTL UI.

BUG=2674

Review URL: http://codereview.chromium.org/79005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14119 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 0 deletions

diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 72ffc6d..b73bdd0 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -496,6 +496,14 @@ bool TemplateURL::SupportsReplacement(const TemplateURL* turl) {
   return turl && turl->url() && turl->url()->SupportsReplacement();
 }
 
+std::wstring TemplateURL::AdjustedShortNameForLocaleDirection() const {
+  std::wstring bidi_safe_short_name;
+  if (l10n_util::AdjustStringForLocaleDirection(short_name_,
+                                                &bidi_safe_short_name))
+    return bidi_safe_short_name;
+  return short_name_;
+}
+
 void TemplateURL::SetSuggestionsURL(const std::wstring& suggestions_url,
                                     int index_offset,
                                     int page_offset) {
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 983621a..e6f2b65 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -272,6 +272,8 @@ class TemplateURL {
   }
   const std::wstring& short_name() const { return short_name_; }
 
+  std::wstring AdjustedShortNameForLocaleDirection() const;
+
   // A description of the template; this may be empty.
   void set_description(const std::wstring& description) {
     description_ = description;