From 4c4d8d2b8aa8ae394d0f933700ddd9e682b141af Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Wed, 4 Mar 2009 05:29:27 +0000 Subject: Convert NavigationEntry title to string16. TabContents::GetTitle no longer needs to be virtual, either. This also changes how the display URL is computed. Instead of doing it preemptively, we now do so lazily. This allows us to do the URL formatting correctly using the elider so that we can do IDN and unescaping. I changed string_util's singleton functions. I was worried that other code might make a singleton of string, which would give you this same value as a non-const string. This would mean our empty strings might no longer be empty. Review URL: http://codereview.chromium.org/39022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10872 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/tab_contents/web_contents.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/tab_contents/web_contents.cc') diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index 1337b51..15b55e4 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -523,7 +523,7 @@ void WebContents::CreateShortcut() { // effectively cancel the pending install request. pending_install_.page_id = entry->page_id(); pending_install_.icon = GetFavIcon(); - pending_install_.title = GetTitle(); + pending_install_.title = UTF16ToWideHack(GetTitle()); pending_install_.url = GetURL(); if (pending_install_.callback_functor) { pending_install_.callback_functor->Cancel(); -- cgit v1.1