Change NavigationEntry's title fields to carry the text direction.

chrome/browser/ui/toolbar/back_forward_menu_model.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 66 matching lines @@
   if (index == GetItemCount() - 1)
     return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK);
 
   // Return an empty string for a separator.
   if (IsSeparator(index))
     return string16();
 
   // Return the entry title, escaping any '&' characters and eliding it if it's
   // super long.
   NavigationEntry* entry = GetNavigationEntry(index);
-  string16 menu_text(entry->GetTitleForDisplay(
+  base::i18n::String16WithDirection menu_text(entry->GetTitleForDisplay(
       GetTabContents()->profile()->GetPrefs()->
           GetString(prefs::kAcceptLanguages)));
-  menu_text = ui::ElideText(menu_text, gfx::Font(), kMaxWidth, false);
+  string16 elided =
+      ui::ElideText(menu_text.string(), gfx::Font(), kMaxWidth, false);
 
 #if !defined(OS_MACOSX)
-  for (size_t i = menu_text.find('&'); i != string16::npos;
-       i = menu_text.find('&', i + 2)) {
-    menu_text.insert(i, 1, '&');
+  for (size_t i = elided.find('&'); i != string16::npos;
+       i = elided.find('&', i + 2)) {
+    elided.insert(i, 1, '&');
   }
 #endif
 
-  return menu_text;
+  // TODO(evan): use directionality of title.
+  // http://code.google.com/p/chromium/issues/detail?id=27094
+  return elided;
 }
 
 bool BackForwardMenuModel::IsItemDynamicAt(int index) const {
   // This object is only used for a single showing of a menu.
   return false;
 }
 
 bool BackForwardMenuModel::GetAcceleratorAt(
     int index,
     ui::Accelerator* accelerator) const {
@@ skipping 342 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }