content/browser/frame_host/navigation_entry_impl.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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/frame_host/navigation_entry_impl.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 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

« components/url_formatter/elide_url.cc ('K') | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/frame_host/navigation_entry_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_entry_impl.cc

diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc

index f15f99973b95553d5dfffe854680bfe3bfab7b58..ecf43c456e6f813196c6913d7f948d3e292c6e6d 100644

--- a/content/browser/frame_host/navigation_entry_impl.cc

+++ b/content/browser/frame_host/navigation_entry_impl.cc

@@ -343,8 +343,7 @@ void NavigationEntryImpl::SetBindings(int bindings) {

bindings_ = bindings;

}

-const base::string16& NavigationEntryImpl::GetTitleForDisplay(

- const std::string& languages) const {

+const base::string16& NavigationEntryImpl::GetTitleForDisplay() const {

// Most pages have real titles. Don't even bother caching anything if this is

// the case.

if (!title_.empty())

@@ -358,9 +357,9 @@ const base::string16& NavigationEntryImpl::GetTitleForDisplay(

// Use the virtual URL first if any, and fall back on using the real URL.

base::string16 title;

if (!virtual_url_.is_empty()) {

- title = url_formatter::FormatUrl(virtual_url_, languages);

+ title = url_formatter::FormatUrl(virtual_url_);

} else if (!GetURL().is_empty()) {

- title = url_formatter::FormatUrl(GetURL(), languages);

+ title = url_formatter::FormatUrl(GetURL());

}

// For file:// URLs use the filename as the title, not the full path.