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

chrome/browser/tab_contents/navigation_controller.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/tab_contents/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 457 matching lines @@
   else
     type = TabContents::TypeForURL(&real_url);
 
   if (url.SchemeIs(chrome::kViewSourceScheme)) {
     // Load the inner URL instead, setting the original URL as the "display".
     real_url = GURL(url.path());
   }
 
   NavigationEntry* entry = new NavigationEntry(type, NULL, -1, real_url,
                                                referrer,
-                                               std::wstring(), transition);
+                                               string16(), transition);
   entry->set_display_url(url);
   entry->set_user_typed_url(url);
   if (url.SchemeIsFile()) {
-    entry->set_title(file_util::GetFilenameFromPath(UTF8ToWide(url.host() +
-                                                               url.path())));
+    entry->set_title(WideToUTF16Hack(
+        file_util::GetFilenameFromPath(UTF8ToWide(url.host() + url.path()))));
   }
   return entry;
 }
 
 void NavigationController::AddTransientEntry(NavigationEntry* entry) {
   // Discard any current transient entry, we can only have one at a time.
   int index = 0;
   if (last_committed_entry_index_ != -1)
     index = last_committed_entry_index_ + 1;
   DiscardTransientEntry();
@@ skipping 12 matching lines @@
 
   LoadEntry(entry);
 }
 
 void NavigationController::LoadURLLazily(const GURL& url,
                                          const GURL& referrer,
                                          PageTransition::Type type,
                                          const std::wstring& title,
                                          SkBitmap* icon) {
   NavigationEntry* entry = CreateNavigationEntry(url, referrer, type);
-  entry->set_title(title);
+  entry->set_title(WideToUTF16Hack(title));
   if (icon)
     entry->favicon().set_bitmap(*icon);
 
   DiscardNonCommittedEntriesInternal();
   pending_entry_ = entry;
   load_pending_entry_when_active_ = true;
 }
 
 bool NavigationController::LoadingURLLazily() {
   return load_pending_entry_when_active_;
 }
 
-const std::wstring& NavigationController::GetLazyTitle() const {
+const string16& NavigationController::GetLazyTitle() const {
   if (pending_entry_)
-    return pending_entry_->GetTitleForDisplay();
+    return pending_entry_->GetTitleForDisplay(this);
   else
-    return EmptyWString();
+    return EmptyString16();
 }
 
 const SkBitmap& NavigationController::GetLazyFavIcon() const {
   if (pending_entry_) {
     return pending_entry_->favicon().bitmap();
   } else {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     return *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
   }
 }
@@ skipping 681 matching lines @@
       return i;
   }
   return -1;
 }
 
 NavigationEntry* NavigationController::GetTransientEntry() const {
   if (transient_entry_index_ == -1)
     return NULL;
   return entries_[transient_entry_index_].get();
 }