chrome/browser/media/protected_media_identifier_infobar_delegate.cc - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/protected_media_identifier_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: Compile fixes following rebase Created 5 years, 6 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

« chrome/browser/autocomplete/history_quick_provider.cc ('K') | « chrome/browser/media/midi_permission_infobar_delegate.cc ('k') | chrome/browser/notifications/desktop_notification_infobar_delegate.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/protected_media_identifier_infobar_delegate.cc

diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc

index ae1637d37b47d1d85fc6412a2f16382417f459df..430c6266f14c68a394cbd12a50e585d66b0f6529 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(