diff options
Diffstat (limited to 'chrome/browser/permissions/permission_bubble_request_impl.cc')
-rw-r--r-- | chrome/browser/permissions/permission_bubble_request_impl.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/permissions/permission_bubble_request_impl.cc b/chrome/browser/permissions/permission_bubble_request_impl.cc index 1e2b13c..f175962 100644 --- a/chrome/browser/permissions/permission_bubble_request_impl.cc +++ b/chrome/browser/permissions/permission_bubble_request_impl.cc @@ -7,9 +7,8 @@ #include "chrome/browser/permissions/permission_context_base.h" #include "chrome/browser/permissions/permission_context_uma_util.h" #include "chrome/grit/generated_resources.h" -#include "components/url_formatter/url_formatter.h" #include "grit/theme_resources.h" -#include "net/base/escape.h" +#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/vector_icons_public2.h" @@ -110,11 +109,10 @@ base::string16 PermissionBubbleRequestImpl::GetMessageText() const { } return l10n_util::GetStringFUTF16( message_id, - url_formatter::FormatUrl( - request_origin_, display_languages_, - url_formatter::kFormatUrlOmitUsernamePassword | - url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, - net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); + net::FormatUrl(request_origin_, display_languages_, + net::kFormatUrlOmitUsernamePassword | + net::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, NULL, NULL, NULL)); } base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const { |