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

content/browser/tab_contents/navigation_entry.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 "content/browser/tab_contents/navigation_entry.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 36 matching lines @@
       page_id_(-1),
       transition_type_(PageTransition::LINK),
       has_post_data_(false),
       restore_type_(RESTORE_NONE) {
 }
 
 NavigationEntry::NavigationEntry(SiteInstance* instance,
                                  int page_id,
                                  const GURL& url,
                                  const GURL& referrer,
-                                 const string16& title,
+                                 const base::i18n::String16WithDirection& title,
                                  PageTransition::Type transition_type)
     : unique_id_(GetUniqueID()),
       site_instance_(instance),
       page_type_(NORMAL_PAGE),
       url_(url),
       referrer_(referrer),
       update_virtual_url_with_url_(false),
       title_(title),
       page_id_(page_id),
       transition_type_(transition_type),
       has_post_data_(false),
       restore_type_(RESTORE_NONE) {
 }
 
 NavigationEntry::~NavigationEntry() {
 }
 
 void NavigationEntry::set_site_instance(SiteInstance* site_instance) {
   site_instance_ = site_instance;
 }
 
-const string16& NavigationEntry::GetTitleForDisplay(
+const base::i18n::String16WithDirection& NavigationEntry::GetTitleForDisplay(
     const std::string& languages) {
   // Most pages have real titles. Don't even bother caching anything if this is
   // the case.
-  if (!title_.empty())
+  if (!title_.is_empty())
     return title_;
 
   // More complicated cases will use the URLs as the title. This result we will
   // cache since it's more complicated to compute.
-  if (!cached_display_title_.empty())
+  if (!cached_display_title_.is_empty())
     return cached_display_title_;
 
   // Use the virtual URL first if any, and fall back on using the real URL.
   string16 title;
   if (!virtual_url_.is_empty()) {
     title = net::FormatUrl(virtual_url_, languages);
   } else if (!url_.is_empty()) {
     title = net::FormatUrl(url_, languages);
   }
 
   // For file:// URLs use the filename as the title, not the full path.
   if (url_.SchemeIsFile()) {
     string16::size_type slashpos = title.rfind('/');
     if (slashpos != string16::npos)
       title = title.substr(slashpos + 1);
   }
 
-  ui::ElideString(title, content::kMaxTitleChars, &cached_display_title_);
+  string16 elided_title;
+  ui::ElideString(title, content::kMaxTitleChars, &elided_title);
+
+  // The computed title is a URL or a filename; assume it's LTR.
+  cached_display_title_ =
+      base::i18n::String16WithDirection(elided_title,
+                                        base::i18n::LEFT_TO_RIGHT);
   return cached_display_title_;
 }
 
 bool NavigationEntry::IsViewSourceMode() const {
   return virtual_url_.SchemeIs(chrome::kViewSourceScheme);
 }