content/browser/web_contents/web_contents_impl.cc - Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace.

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: content/browser/web_contents/web_contents_impl.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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

« no previous file with comments | « content/browser/web_contents/web_contents_drag_win.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 8e34582f010bbd996f61871921a9b92f281dac92..9cd08f82d0ce1e4ece53e8eac3344b38273d965c 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -2709,7 +2709,7 @@ bool WebContentsImpl::UpdateTitleForEntry(NavigationEntryImpl* entry,

base::string16 final_title;

bool explicit_set;

if (entry && entry->GetURL().SchemeIsFile() && title.empty()) {

- final_title = UTF8ToUTF16(entry->GetURL().ExtractFileName());

+ final_title = base::UTF8ToUTF16(entry->GetURL().ExtractFileName());

explicit_set = false; // Don't count synthetic titles toward the set limit.

} else {

TrimWhitespace(title, TRIM_ALL, &final_title);