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 /content/browser/tab_contents/interstitial_page.h | |
| 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 'content/browser/tab_contents/interstitial_page.h')
| -rw-r--r-- | content/browser/tab_contents/interstitial_page.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h index 759d8b3..2633519 100644 --- a/content/browser/tab_contents/interstitial_page.h +++ b/content/browser/tab_contents/interstitial_page.h @@ -9,7 +9,6 @@ #include <map> #include <string> -#include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" #include "base/process_util.h" #include "content/browser/renderer_host/render_view_host_delegate.h" @@ -129,10 +128,9 @@ class InterstitialPage : public NotificationObserver, int error_code); virtual void DidNavigate(RenderViewHost* render_view_host, const ViewHostMsg_FrameNavigate_Params& params); - virtual void UpdateTitle( - RenderViewHost* render_view_host, - int32 page_id, - const base::i18n::String16WithDirection& title) OVERRIDE; + virtual void UpdateTitle(RenderViewHost* render_view_host, + int32 page_id, + const std::wstring& title); virtual void DomOperationResponse(const std::string& json_string, int automation_id); virtual RendererPreferences GetRendererPrefs(Profile* profile) const; @@ -228,7 +226,7 @@ class InterstitialPage : public NotificationObserver, // The original title of the tab that should be reverted to when the // interstitial is hidden. - base::i18n::String16WithDirection original_tab_title_; + std::wstring original_tab_title_; // Our RenderViewHostViewDelegate, necessary for accelerators to work. scoped_ptr<InterstitialPageRVHViewDelegate> rvh_view_delegate_; |