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

Mark most of the users with a tag pointing at the bug, so they can
be fixed incrementally.

BUG=27094

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

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

3 files changed, 18 insertions, 6 deletions

diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index b9faaa1..455f376 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -158,7 +158,10 @@ SessionCommand* BaseSessionService::CreateUpdateTabNavigationCommand(
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
                       entry.virtual_url().spec());
 
-  WriteString16ToPickle(pickle, &bytes_written, max_state_size, entry.title());
+  // TODO(evan): use directionality of title.
+  // http://code.google.com/p/chromium/issues/detail?id=27094
+  WriteString16ToPickle(pickle, &bytes_written, max_state_size,
+                        entry.title().string());
 
   if (entry.has_post_data()) {
     // Remove the form data, it may contain sensitive information.
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index d10548e9..b04c015 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -71,7 +71,11 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
     NavigationEntry entry;
     entry.set_url(navigation.virtual_url());
     entry.set_referrer(navigation.referrer());
-    entry.set_title(navigation.title());
+    // TODO(evan): use directionality of title.
+    // http://code.google.com/p/chromium/issues/detail?id=27094
+    entry.set_title(
+        base::i18n::String16WithDirection(navigation.title(),
+                                          base::i18n::LEFT_TO_RIGHT));
     entry.set_content_state(navigation.state());
     entry.set_transition_type(navigation.transition());
     entry.set_has_post_data(
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index f9b1ffd..c4dba83 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -68,7 +68,10 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id,
       profile);
 
   entry->set_page_id(page_id);
-  entry->set_title(title_);
+  // TODO(evan): use directionality of title.
+  // http://code.google.com/p/chromium/issues/detail?id=27094
+  entry->set_title(
+      base::i18n::String16WithDirection(title_, base::i18n::LEFT_TO_RIGHT));
   entry->set_content_state(state_);
   entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA);
 
@@ -78,7 +81,9 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id,
 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) {
   virtual_url_ = entry.virtual_url();
   referrer_ = entry.referrer();
-  title_ = entry.title();
+  // TODO(evan): use directionality of title.
+  // http://code.google.com/p/chromium/issues/detail?id=27094
+  title_ = entry.title().string();
   state_ = entry.content_state();
   transition_ = entry.transition_type();
   type_mask_ = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0;