diff options
Diffstat (limited to 'content/browser/tab_contents/interstitial_page.cc')
| -rw-r--r-- | content/browser/tab_contents/interstitial_page.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc index 269336c..da0b968 100644 --- a/content/browser/tab_contents/interstitial_page.cc +++ b/content/browser/tab_contents/interstitial_page.cc @@ -270,7 +270,7 @@ void InterstitialPage::Hide() { // Let's revert to the original title if necessary. NavigationEntry* entry = tab_->controller().GetActiveEntry(); if (!new_navigation_ && should_revert_tab_title_) { - entry->set_title(original_tab_title_); + entry->set_title(WideToUTF16Hack(original_tab_title_)); tab_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TITLE); } delete this; @@ -383,10 +383,9 @@ void InterstitialPage::DidNavigate( tab_->SetIsLoading(false, NULL); } -void InterstitialPage::UpdateTitle( - RenderViewHost* render_view_host, - int32 page_id, - const base::i18n::String16WithDirection& title) { +void InterstitialPage::UpdateTitle(RenderViewHost* render_view_host, + int32 page_id, + const std::wstring& title) { DCHECK(render_view_host == render_view_host_); NavigationEntry* entry = tab_->controller().GetActiveEntry(); if (!entry) { @@ -405,10 +404,10 @@ void InterstitialPage::UpdateTitle( // If this interstitial is shown on an existing navigation entry, we'll need // to remember its title so we can revert to it when hidden. if (!new_navigation_ && !should_revert_tab_title_) { - original_tab_title_ = entry->title(); + original_tab_title_ = UTF16ToWideHack(entry->title()); should_revert_tab_title_ = true; } - entry->set_title(title); + entry->set_title(WideToUTF16Hack(title)); tab_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TITLE); } |