request review: fix issue 2821 and 6132

chrome/browser/views/shelf_item_dialog.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/shelf_item_dialog.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/string_util.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 113 matching lines @@
     }
     return results_[row].title;
   }
 
   virtual std::wstring GetText(int row, int col_id) {
     if (row < 0 || row >= RowCount()) {
       NOTREACHED();
       return std::wstring();
     }
 
-    if (col_id == IDS_ASI_PAGE_COLUMN)
-      return GetTitle(row);
+    if (col_id == IDS_ASI_PAGE_COLUMN) {
+      const std::wstring& title = GetTitle(row);
+      // TODO(xji): Consider adding a special case if the title text is a URL,
+      // since those should always have LTR directionality. Please refer to
+      // http://crbug.com/6726 for more information.
+      std::wstring localized_title;
+      if (l10n_util::AdjustStringForLocaleDirection(title, &localized_title))
+        return localized_title;
+      return title;
+    }
 
     // TODO(brettw): this should probably pass the GURL up so the URL elider
     // can be used at a higher level when we know the width.
-    return results_[row].display_url.display_url();
+    const std::wstring& url = results_[row].display_url.display_url();
+    if (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT)
+      return url;
+    // Force URL to be LTR.
+    std::wstring localized_url = url;
+    l10n_util::WrapStringWithLTRFormatting(&localized_url);
+    return localized_url;
   }
 
   virtual SkBitmap GetIcon(int row) {
     if (row < 0 || row >= RowCount()) {
       NOTREACHED();
       return *default_fav_icon;
     }
 
     Result& result = results_[row];
     FavIconMap::iterator i = fav_icon_map_.find(result.index);
@@ skipping 345 matching lines @@
     PerformModelChange();
     if (window())
       window()->Close();
   }
 }
 
 GURL ShelfItemDialog::GetInputURL() const {
   return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L""));
 }