diff options
Diffstat (limited to 'ios')
-rw-r--r-- | ios/web/DEPS | 1 | ||||
-rw-r--r-- | ios/web/ios_web.gyp | 1 | ||||
-rw-r--r-- | ios/web/navigation/navigation_item_impl.mm | 6 | ||||
-rw-r--r-- | ios/web/web_state/ui/crw_web_controller.mm | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/ios/web/DEPS b/ios/web/DEPS index 237ab93..a956ff6 100644 --- a/ios/web/DEPS +++ b/ios/web/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/url_formatter", "+crypto", "+ios/public/provider/web", "+ios/net", diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp index 577d15d..22fb83b 100644 --- a/ios/web/ios_web.gyp +++ b/ios/web/ios_web.gyp @@ -51,7 +51,6 @@ 'js_resources', 'user_agent', '../../base/base.gyp:base', - '../../components/url_formatter/url_formatter.gyp:url_formatter', '../../content/content.gyp:content_browser', '../../ios/net/ios_net.gyp:ios_net', '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokenizer', diff --git a/ios/web/navigation/navigation_item_impl.mm b/ios/web/navigation/navigation_item_impl.mm index 76ddec7..6b423d1 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 @@ const base::string16& NavigationItemImpl::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 = 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. diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm index 165aff9..6d89070 100644 --- a/ios/web/web_state/ui/crw_web_controller.mm +++ b/ios/web/web_state/ui/crw_web_controller.mm @@ -28,7 +28,6 @@ #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" @@ -80,6 +79,7 @@ #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,8 +3573,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; DCHECK(web::GetWebClient()); const std::string& acceptLangs = web::GetWebClient()->GetAcceptLangs( self.webStateImpl->GetBrowserState()); - base::string16 urlText = - url_formatter::FormatUrl(GURL(href), acceptLangs); + base::string16 urlText = net::FormatUrl(GURL(href), acceptLangs); title = base::SysUTF16ToNSString(urlText); } } |