chrome/browser/browser.cc - Issue 39022: Convert NavigationEntry title to string16. TabContents::GetTitle no longer ne...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browser.cc

Issue 39022: Convert NavigationEntry title to string16. TabContents::GetTitle no longer ne... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/browser.cc

===================================================================

--- chrome/browser/browser.cc (revision 10809)

+++ chrome/browser/browser.cc (working copy)

@@ -399,7 +399,7 @@

// |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())

@@ -738,8 +738,9 @@

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.

« no previous file with comments | « base/string_util.cc ('k') | chrome/browser/debugger/debugger_host_impl.cpp » ('j') | no next file with comments »