Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

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: Compile fixes following rebase Created 5 years, 6 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 3c51dc1df450572b230fdad676d256b0baba4e33..de60fab2a0841015c5159ae7c60055187d177786 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -27,6 +27,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"
@@ -76,7 +77,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"
@@ -3532,7 +3532,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);
}
}

Powered by Google App Engine
This is Rietveld 408576698