diff options
Diffstat (limited to 'chrome/browser/media')
3 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index 978e0e8..0c91b5b 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -18,13 +18,13 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" +#include "components/url_formatter/url_formatter.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" #include "grit/theme_resources.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" @@ -112,7 +112,8 @@ base::string16 GetTitle(WebContents* web_contents) { Profile::FromBrowserContext(web_contents->GetBrowserContext()); std::string languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages); - if (tab_title == net::FormatUrl(web_contents->GetURL(), languages)) + if (tab_title == + url_formatter::FormatUrl(web_contents->GetURL(), languages)) tab_title = GetSecurityOrigin(web_contents); } diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/media/midi_permission_infobar_delegate.cc index 5a590cd..40cc694 100644 --- a/chrome/browser/media/midi_permission_infobar_delegate.cc +++ b/chrome/browser/media/midi_permission_infobar_delegate.cc @@ -7,8 +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/net_util.h" #include "ui/base/l10n/l10n_util.h" // static @@ -45,8 +45,9 @@ int MidiPermissionInfoBarDelegate::GetIconID() const { base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const { return l10n_util::GetStringFUTF16( IDS_MIDI_SYSEX_INFOBAR_QUESTION, - net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, - net::kFormatUrlOmitUsernamePassword | - net::kFormatUrlOmitTrailingSlashOnBareHostname, - net::UnescapeRule::SPACES, NULL, NULL, NULL)); + url_formatter::FormatUrl( + requesting_frame_.GetOrigin(), display_languages_, + url_formatter::kFormatUrlOmitUsernamePassword | + url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, + net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); } diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc index 4d4cbcc..5dbd69e 100644 --- a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc +++ b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc @@ -10,9 +10,9 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" +#include "components/url_formatter/url_formatter.h" #include "grit/components_strings.h" #include "grit/theme_resources.h" -#include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" // static @@ -77,7 +77,8 @@ void ProtectedMediaIdentifierInfoBarDelegate::InfoBarDismissed() { base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetMessageText() const { return l10n_util::GetStringFUTF16( IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION, - net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_)); + url_formatter::FormatUrl(requesting_frame_.GetOrigin(), + display_languages_)); } base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetButtonLabel( |