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

Unified Diff: chrome/browser/media/midi_permission_infobar_delegate.cc

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: Rebase again now that CQ is fixed Created 5 years, 4 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: chrome/browser/media/midi_permission_infobar_delegate.cc
diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/media/midi_permission_infobar_delegate.cc
index 5a590cdccb85bf14f7011fafc3faa2fd6fa9736c..40cc6944c9c372eb67d7001174c876f2b9dc7114 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));
}

Powered by Google App Engine
This is Rietveld 408576698