diff options
Diffstat (limited to 'chrome/browser/notifications')
-rw-r--r-- | chrome/browser/notifications/notification_permission_infobar_delegate.cc | 12 | ||||
-rw-r--r-- | chrome/browser/notifications/platform_notification_service_impl.cc | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/chrome/browser/notifications/notification_permission_infobar_delegate.cc b/chrome/browser/notifications/notification_permission_infobar_delegate.cc index 00316e2..54ccf0b 100644 --- a/chrome/browser/notifications/notification_permission_infobar_delegate.cc +++ b/chrome/browser/notifications/notification_permission_infobar_delegate.cc @@ -7,9 +7,8 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.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" // static @@ -46,9 +45,8 @@ int NotificationPermissionInfobarDelegate::GetIconID() const { base::string16 NotificationPermissionInfobarDelegate::GetMessageText() const { return l10n_util::GetStringFUTF16( IDS_NOTIFICATION_PERMISSIONS, - url_formatter::FormatUrl( - requesting_frame_.GetOrigin(), display_languages_, - url_formatter::kFormatUrlOmitUsernamePassword | - url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, - net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); + net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, + net::kFormatUrlOmitUsernamePassword | + net::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); } diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc index 407971d..63508b3 100644 --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc @@ -17,13 +17,13 @@ #include "chrome/common/pref_names.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h" -#include "components/url_formatter/url_formatter.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_notification_delegate.h" #include "content/public/browser/notification_event_dispatcher.h" #include "content/public/browser/platform_notification_context.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/platform_notification_data.h" +#include "net/base/net_util.h" #include "ui/message_center/notifier_settings.h" #include "url/url_constants.h" @@ -391,8 +391,7 @@ base::string16 PlatformNotificationServiceImpl::WebOriginDisplayName( spec.begin() + parsed.CountCharactersBefore(url::Parsed::USERNAME, true)); } - formatted_origin.append( - url_formatter::IDNToUnicode(origin.host(), languages)); + formatted_origin.append(net::IDNToUnicode(origin.host(), languages)); if (origin.has_port()) { formatted_origin.push_back(':'); formatted_origin.append(base::UTF8ToUTF16(origin.port())); @@ -402,5 +401,5 @@ base::string16 PlatformNotificationServiceImpl::WebOriginDisplayName( // TODO(dewittj): Once file:// URLs are passed in to the origin // GURL here, begin returning the path as the display name. - return url_formatter::FormatUrl(origin, languages); + return net::FormatUrl(origin, languages); } |