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

chrome/browser/browser.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/browser.h"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 381 matching lines @@
 }
 
 std::wstring Browser::GetCurrentPageTitle() const {
 #if defined(OS_WIN)
   TabContents* contents = tabstrip_model_.GetSelectedTabContents();
   std::wstring title;
 
   // |contents| can be NULL because GetCurrentPageTitle is called by the window
   // during the window's creation (before tabs have been added).
   if (contents) {
-    title = contents->GetTitle();
+    title = UTF16ToWideHack(contents->GetTitle());
     FormatTitleForDisplay(&title);
   }
   if (title.empty())
     title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
 
   return l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT, title);
 #elif defined(OS_POSIX)
   // TODO(port): turn on when generating chrome_strings.h from grit
   return L"untitled";
 #endif
@@ skipping 318 matching lines @@
   if (!model || !model->IsLoaded())
     return;  // Ignore requests until bookmarks are loaded.
 
   NavigationEntry* entry = contents->controller()->GetActiveEntry();
   if (!entry)
     return;  // Can't star if there is no URL.
   const GURL& url = entry->display_url();
   if (url.is_empty() || !url.is_valid())
     return;
 
+  model->SetURLStarred(url, UTF16ToWideHack(entry->title()), true);
   bool was_bookmarked = model->IsBookmarked(url);
-  model->SetURLStarred(url, entry->title(), true);
+  model->SetURLStarred(url, UTF16ToWideHack(entry->title()), true);
   if (window_->IsActive()) {
     // Only show the bubble if the window is active, otherwise we may get into
     // weird situations were the bubble is deleted as soon as it is shown.
     window_->ShowBookmarkBubble(url, was_bookmarked);
   }
 }
 
 void Browser::SavePage() {
   UserMetrics::RecordAction(L"SavePage", profile_);
   GetSelectedTabContents()->AsWebContents()->OnSavePage();
@@ skipping 1701 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }