ios/web/web_state/ui/crw_web_controller.mm - Issue 1171333003: 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/web_state/ui/crw_web_controller.mm

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

Patch Set: Rebase again now that CQ is fixed 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/web_state/ui/crw_web_controller.mm

diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm

index 6d8907026d14d2804052f0ca8990aa0a414b8f9a..165aff9f56a5730748ba5fb0fa351f637ed03893 100644

--- a/ios/web/web_state/ui/crw_web_controller.mm

+++ b/ios/web/web_state/ui/crw_web_controller.mm

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

#include "base/strings/utf_string_conversions.h"

#include "base/time/time.h"

#include "base/values.h"

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

#import "ios/net/nsurlrequest_util.h"

#include "ios/public/provider/web/web_ui_ios.h"

#import "ios/web/history_state_util.h"

@@ -79,7 +80,6 @@

#import "ios/web/web_state/web_state_impl.h"

#import "net/base/mac/url_conversions.h"

#include "net/base/net_errors.h"

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

#import "ui/base/ios/cru_context_menu_holder.h"

#include "ui/base/page_transition_types.h"

#include "url/gurl.h"

@@ -3573,7 +3573,8 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;

DCHECK(web::GetWebClient());

const std::string& acceptLangs = web::GetWebClient()->GetAcceptLangs(

self.webStateImpl->GetBrowserState());

- base::string16 urlText = net::FormatUrl(GURL(href), acceptLangs);

+ base::string16 urlText =

+ url_formatter::FormatUrl(GURL(href), acceptLangs);

title = base::SysUTF16ToNSString(urlText);

}

« no previous file with comments | « ios/web/navigation/navigation_item_impl.mm ('k') | net/base/net_util.h » ('j') | no next file with comments »