Convert NavigationEntry title to string16. TabContents::GetTitle no longer ne...

chrome/browser/views/blocked_popup_container.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 // Implementation of BlockedPopupContainer and its corresponding View
 // class. The BlockedPopupContainer is the sort of Model class which owns the
 // blocked popups' TabContents (but like most Chromium interface code, it there
 // isn't a strict Model/View separation), and BlockedPopupContainerView
 // presents the user interface controls, creates and manages the popup menu.
 
@@ skipping 280 matching lines @@
     CloseAllPopups();
 }
 
 int BlockedPopupContainer::GetTabContentsCount() const {
   return blocked_popups_.size();
 }
 
 std::wstring BlockedPopupContainer::GetDisplayStringForItem(int index) {
   const GURL& url = blocked_popups_[index].first->GetURL().GetOrigin();
 
-  std::wstring label =
-      l10n_util::GetStringF(IDS_POPUP_TITLE_FORMAT,
-                            UTF8ToWide(url.possibly_invalid_spec()),
-                            blocked_popups_[index].first->GetTitle());
+  std::wstring label = l10n_util::GetStringF(
+      IDS_POPUP_TITLE_FORMAT,
+      UTF8ToWide(url.possibly_invalid_spec()),
+      UTF16ToWideHack(blocked_popups_[index].first->GetTitle()));
   return label;
 }
 
 void BlockedPopupContainer::CloseAllPopups() {
   CloseEachTabContents();
   owner_->PopupNotificationVisibilityChanged(false);
   container_view_->UpdatePopupCountLabel();
   HideSelf();
 }
 
@@ skipping 183 matching lines @@
 
 void BlockedPopupContainer::CloseEachTabContents() {
   while (!blocked_popups_.empty()) {
     blocked_popups_.back().first->set_delegate(NULL);
     blocked_popups_.back().first->CloseContents();
     blocked_popups_.pop_back();
   }
 
   blocked_popups_.clear();
 }