diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 19:30:51 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 19:30:51 +0000 |
| commit | 6b2f7a8c4ca23b35ef56246a7a86b0d414ac89ea (patch) | |
| tree | 66d4d53b14636317320e4b54233717e1a18dd1eb /chrome/browser/sessions | |
| parent | 434d5c04054dd81df1973b80ffbc8f92b8673d70 (diff) | |
| download | chromium_src-6b2f7a8c4ca23b35ef56246a7a86b0d414ac89ea.zip chromium_src-6b2f7a8c4ca23b35ef56246a7a86b0d414ac89ea.tar.gz chromium_src-6b2f7a8c4ca23b35ef56246a7a86b0d414ac89ea.tar.bz2 | |
Revert my recent changes regarding title directionality.
This reverts:
r82400: Plumb direction of document title through IPC layer.
r82582: Add and use a base::i18n::StringWithDirection for carrying titles.
r82778: Change NavigationEntry's title fields to carry the text direction.
I'm going to take an alternative approach; after getting this far, I can
see that this approach was too complicated.
BUG=27094
Review URL: http://codereview.chromium.org/6901003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/base_session_service.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_service_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_types.cc | 9 |
3 files changed, 4 insertions, 16 deletions
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 455f376..ba44fd8 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -158,10 +158,7 @@ SessionCommand* BaseSessionService::CreateUpdateTabNavigationCommand( WriteStringToPickle(pickle, &bytes_written, max_state_size, entry.virtual_url().spec()); - // 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()); + WriteString16ToPickle(pickle, &bytes_written, max_state_size, entry.title()); 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 b04c015..d10548e9 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -71,11 +71,7 @@ class SessionServiceTest : public BrowserWithTestWindowTest, NavigationEntry entry; entry.set_url(navigation.virtual_url()); entry.set_referrer(navigation.referrer()); - // 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_title(navigation.title()); 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 c4dba83..5749f31 100644 --- a/chrome/browser/sessions/session_types.cc +++ b/chrome/browser/sessions/session_types.cc @@ -68,10 +68,7 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id, profile); entry->set_page_id(page_id); - // 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_title(title_); entry->set_content_state(state_); entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA); @@ -81,9 +78,7 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id, void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) { virtual_url_ = entry.virtual_url(); referrer_ = entry.referrer(); - // TODO(evan): use directionality of title. - // http://code.google.com/p/chromium/issues/detail?id=27094 - title_ = entry.title().string(); + title_ = entry.title(); state_ = entry.content_state(); transition_ = entry.transition_type(); type_mask_ = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0; |