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

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2006-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.
 
 #include "chrome/browser/views/location_bar_view.h"
 
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
@@ skipping 304 matching lines @@
 
 SkBitmap LocationBarView::GetFavIcon() const {
   DCHECK(delegate_);
   DCHECK(delegate_->GetTabContents());
   return delegate_->GetTabContents()->GetFavIcon();
 }
 
 std::wstring LocationBarView::GetTitle() const {
   DCHECK(delegate_);
   DCHECK(delegate_->GetTabContents());
-  return delegate_->GetTabContents()->GetTitle();
+  return UTF16ToWideHack(delegate_->GetTabContents()->GetTitle());
 }
 
 void LocationBarView::DoLayout(const bool force_layout) {
   if (!location_entry_.get())
     return;
 
   RECT formatting_rect;
   location_entry_->GetRect(&formatting_rect);
   RECT edit_bounds;
   location_entry_->GetClientRect(&edit_bounds);
@@ skipping 663 matching lines @@
 }
 
 void LocationBarView::FocusSearch() {
   location_entry_->SetUserText(L"?");
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SaveStateToContents(TabContents* contents) {
   location_entry_->SaveStateToTab(contents);
 }