diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 06:13:02 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 06:13:02 +0000 |
| commit | cee9de4e4af9a1d441a1540c6c7a676c35042994 (patch) | |
| tree | ac2034b3195281551dde58be9f4b2c32d8b8f8c0 /chrome/browser/tab_contents | |
| parent | d01902d70e46a90fc24d3a442805a4a665d373ca (diff) | |
| download | chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.zip chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.tar.gz chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.tar.bz2 | |
Fix the build with some forgotten string conversions on non-Windows.
Review URL: http://codereview.chromium.org/40099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/interstitial_page.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/web_contents.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index fad7d21..bfaf9bb 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -190,7 +190,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; diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index 15b55e4..bd3c1c5 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -1728,10 +1728,10 @@ bool WebContents::UpdateTitleForEntry(NavigationEntry* entry, explicit_set = true; } - if (final_title == entry->title()) + if (final_title == UTF16ToWideHack(entry->title())) return false; // Nothing changed, don't bother. - entry->set_title(final_title); + entry->set_title(WideToUTF16Hack(final_title)); // Update the history system for this page. if (!profile()->IsOffTheRecord() && !received_page_title_) { |