ios/web/navigation/navigation_item_impl.mm - Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components

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: ios/web/navigation/navigation_item_impl.mm

Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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: ios/web/navigation/navigation_item_impl.mm

diff --git a/ios/web/navigation/navigation_item_impl.mm b/ios/web/navigation/navigation_item_impl.mm

index 76ddec71fb7b5fbf23b9c582e36927acadd12c6a..6b423d1ae8a53c7d3e4e7c74eb4b9d2fa3a603c1 100644

--- a/ios/web/navigation/navigation_item_impl.mm

+++ b/ios/web/navigation/navigation_item_impl.mm

@@ -6,7 +6,7 @@

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

-#include "components/url_formatter/url_formatter.h"

+#include "net/base/net_util.h"

#include "ui/base/page_transition_types.h"

#include "ui/gfx/text_elider.h"

@@ -138,9 +138,9 @@

// 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 = net::FormatUrl(virtual_url_, languages);

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

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

+ title = net::FormatUrl(url_, languages);

}

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

« no previous file with comments | « ios/web/ios_web.gyp ('k') | ios/web/web_state/ui/crw_web_controller.mm » ('j') | no next file with comments »