Fix 16/wide build bustange on non-Windows.

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

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

5 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 1dbe57f..9f5e544 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -183,7 +183,7 @@ class TabStripBridge : public TabStripModelObserver {
 - (void)setTabTitle:(NSButton*)tab withContents:(TabContents*)contents {
   NSString* titleString = nil;
   if (contents)
-    titleString = base::SysWideToNSString(contents->GetTitle());
+    titleString = base::SysUTF16ToNSString(contents->GetTitle());
   if (![titleString length])
     titleString = NSLocalizedString(@"untitled", nil);
   [tab setTitle:titleString];
diff --git a/chrome/browser/debugger/debugger_host_impl.cpp b/chrome/browser/debugger/debugger_host_impl.cpp
index 0a2bb81..beeb398 100644
--- a/chrome/browser/debugger/debugger_host_impl.cpp
+++ b/chrome/browser/debugger/debugger_host_impl.cpp
@@ -98,7 +98,7 @@ void DebuggerHostImpl::OnDebugAttach() {
   std::wstring title;
   const TabContents* t = GetTabContentsBeingDebugged();
   if (t) {
-    title = t->GetTitle();
+    title = UTF16ToWideHack(t->GetTitle());
   }
 
   ListValue* argv = new ListValue;
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index a87ea6c..84853b7 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -35,7 +35,7 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const {
 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) {
   url_ = entry.display_url();
   referrer_ = entry.referrer();
-  title_ = entry.title();
+  title_ = UTF16ToWideHack(entry.title());
   state_ = entry.content_state();
   transition_ = entry.transition_type();
   type_mask_ = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0;
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index bfaf9bb..e0ebd23 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -395,7 +395,7 @@ void InterstitialPage::UpdateTitle(RenderViewHost* render_view_host,
     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);
 }
 
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index bd3c1c5..dd2820b 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -597,7 +597,7 @@ void WebContents::OnSavePage() {
   DCHECK(prefs);
 
   FilePath suggest_name = SavePackage::GetSuggestNameForSaveAs(prefs,
-      FilePath::FromWStringHack(GetTitle()));
+      FilePath::FromWStringHack(UTF16ToWideHack(GetTitle())));
 
   SavePackage::SavePackageParam param(contents_mime_type());
   param.prefs = prefs;