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

content/browser/tab_contents/tab_contents.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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 436 matching lines @@
   // We may not have a navigation entry yet
   NavigationEntry* entry = controller_.GetActiveEntry();
   return entry ? entry->virtual_url() : GURL::EmptyGURL();
 }
 
 const string16& TabContents::GetTitle() const {
   // Transient entries take precedence. They are used for interstitial pages
   // that are shown on top of existing pages.
   NavigationEntry* entry = controller_.GetTransientEntry();
   if (entry) {
+    // TODO(evan): use directionality of title.
+    // http://code.google.com/p/chromium/issues/detail?id=27094
     return entry->GetTitleForDisplay(profile()->GetPrefs()->
-        GetString(prefs::kAcceptLanguages));
+        GetString(prefs::kAcceptLanguages)).string();
   }
   WebUI* our_web_ui = render_manager_.pending_web_ui() ?
       render_manager_.pending_web_ui() : render_manager_.web_ui();
   if (our_web_ui) {
     // Don't override the title in view source mode.
     entry = controller_.GetActiveEntry();
     if (!(entry && entry->IsViewSourceMode())) {
       // Give the Web UI the chance to override our title.
+      // TODO(evan): use directionality of title.
+      // http://code.google.com/p/chromium/issues/detail?id=27094
       const string16& title = our_web_ui->overridden_title();
       if (!title.empty())
         return title;
     }
   }
 
   // We use the title for the last committed entry rather than a pending
   // navigation entry. For example, when the user types in a URL, we want to
   // keep the old page's title until the new load has committed and we get a new
   // title.
   entry = controller_.GetLastCommittedEntry();
   if (entry) {
+    // TODO(evan): use directionality of title.
+    // http://code.google.com/p/chromium/issues/detail?id=27094
     return entry->GetTitleForDisplay(profile()->GetPrefs()->
-        GetString(prefs::kAcceptLanguages));
+        GetString(prefs::kAcceptLanguages)).string();
   }
   return EmptyString16();
 }
 
 int32 TabContents::GetMaxPageID() {
   if (GetSiteInstance())
     return GetSiteInstance()->max_page_id();
   else
     return max_page_id_;
 }
@@ skipping 649 matching lines @@
   HistoryService* hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
   if (hs)
     hs->AddPage(*add_page_args);
 }
 
 void TabContents::UpdateHistoryPageTitle(const NavigationEntry& entry) {
   if (profile()->IsOffTheRecord())
     return;
 
   HistoryService* hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
-  if (hs)
-    hs->SetPageTitle(entry.virtual_url(), entry.title());
+  if (hs) {
+    // TODO(evan): use directionality of title.
+    // http://code.google.com/p/chromium/issues/detail?id=27094
+    hs->SetPageTitle(entry.virtual_url(), entry.title().string());
+  }
 }
 
 double TabContents::GetZoomLevel() const {
   HostZoomMap* zoom_map = profile()->GetHostZoomMap();
   if (!zoom_map)
     return 0;
 
   double zoom_level;
   if (temporary_zoom_settings_) {
     zoom_level = zoom_map->GetTemporaryZoomLevel(
@@ skipping 499 matching lines @@
     // they saw in the URL bar, so we add the virtual URL as a redirect.  This
     // only applies to the main frame, as the virtual URL doesn't apply to
     // sub-frames.
     add_page_args->url = virtual_url;
     if (!add_page_args->redirects.empty())
       add_page_args->redirects.back() = virtual_url;
   }
   return add_page_args;
 }
 
-bool TabContents::UpdateTitleForEntry(NavigationEntry* entry,
-                                      const std::wstring& title) {
+bool TabContents::UpdateTitleForEntry(
+    NavigationEntry* entry,
+    const base::i18n::String16WithDirection& title) {
   // For file URLs without a title, use the pathname instead. In the case of a
   // synthesized title, we don't want the update to count toward the "one set
   // per page of the title to history."
-  string16 final_title;
+  base::i18n::String16WithDirection final_title;
   bool explicit_set;
-  if (entry->url().SchemeIsFile() && title.empty()) {
-    final_title = UTF8ToUTF16(entry->url().ExtractFileName());
+  if (entry->url().SchemeIsFile() && title.is_empty()) {
+    final_title = base::i18n::String16WithDirection(
+        UTF8ToUTF16(entry->url().ExtractFileName()),
+        base::i18n::LEFT_TO_RIGHT);
     explicit_set = false;  // Don't count synthetic titles toward the set limit.
   } else {
-    TrimWhitespace(WideToUTF16Hack(title), TRIM_ALL, &final_title);
+    string16 trimmed;
+    TrimWhitespace(title.string(), TRIM_ALL, &trimmed);
+    final_title = base::i18n::String16WithDirection(trimmed, title.direction());
     explicit_set = true;
   }
 
   if (final_title == entry->title())
     return false;  // Nothing changed, don't bother.
 
   entry->set_title(final_title);
 
   if (!received_page_title_) {
     UpdateHistoryPageTitle(*entry);
     received_page_title_ = explicit_set;
   }
 
   // Lastly, set the title for the view.
-  view_->SetPageTitle(UTF16ToWideHack(final_title));
+  // TODO(evan): use directionality of title.
+  // http://code.google.com/p/chromium/issues/detail?id=27094
+  view_->SetPageTitle(UTF16ToWide(final_title.string()));
 
   NotificationService::current()->Notify(
       NotificationType::TAB_CONTENTS_TITLE_UPDATED,
       Source<TabContents>(this),
       NotificationService::NoDetails());
 
   return true;
 }
 
 void TabContents::NotifySwapped() {
@@ skipping 285 matching lines @@
 void TabContents::UpdateTitle(RenderViewHost* rvh,
                               int32 page_id,
                               const base::i18n::String16WithDirection& title) {
   // If we have a title, that's a pretty good indication that we've started
   // getting useful data.
   SetNotWaitingForResponse();
 
   DCHECK(rvh == render_view_host());
   NavigationEntry* entry = controller_.GetEntryWithPageID(rvh->site_instance(),
                                                           page_id);
-  // TODO(evan): use directionality of title.
-  // http://code.google.com/p/chromium/issues/detail?id=27094
-  if (!entry || !UpdateTitleForEntry(entry, UTF16ToWide(title.string())))
+  if (!entry || !UpdateTitleForEntry(entry, title))
     return;
 
   // Broadcast notifications when the UI should be updated.
   if (entry == controller_.GetEntryAtOffset(0))
     NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }
 
 void TabContents::UpdateEncoding(RenderViewHost* render_view_host,
                                  const std::string& encoding) {
   set_encoding(encoding);
@@ skipping 527 matching lines @@
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }
 
 void TabContents::OnOnlineStateChanged(bool online) {
   render_view_host()->Send(new ViewMsg_NetworkStateChanged(
       render_view_host()->routing_id(), online));
 }