chrome/browser/pepper_broker_infobar_delegate.cc - Issue 1260033005: Revert of 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/pepper_broker_infobar_delegate.cc

Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/notifications/platform_notification_service_impl.cc ('k') | chrome/browser/permissions/permission_bubble_request_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/pepper_broker_infobar_delegate.cc

diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc

index 0fa86d445394f751b1f4c99b441a1ef887d3e9b5..ca7a597103cfff550bb1da86c3e8fd1561b0fc20 100644

--- a/chrome/browser/pepper_broker_infobar_delegate.cc

+++ b/chrome/browser/pepper_broker_infobar_delegate.cc

@@ -14,7 +14,6 @@

#include "chrome/grit/generated_resources.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "components/infobars/core/infobar.h"

-#include "components/url_formatter/url_formatter.h"

#include "content/public/browser/page_navigator.h"

#include "content/public/browser/plugin_service.h"

#include "content/public/browser/user_metrics.h"

@@ -23,6 +22,7 @@

#include "content/public/common/webplugininfo.h"

#include "grit/components_strings.h"

#include "grit/theme_resources.h"

+#include "net/base/net_util.h"

#include "ui/base/l10n/l10n_util.h"

@@ -104,9 +104,10 @@

DCHECK(success);

scoped_ptr<PluginMetadata> plugin_metadata(

PluginFinder::GetInstance()->GetPluginMetadata(plugin));

- return l10n_util::GetStringFUTF16(

- IDS_PEPPER_BROKER_MESSAGE, plugin_metadata->name(),

- url_formatter::FormatUrl(url_.GetOrigin(), languages_));

+ return l10n_util::GetStringFUTF16(IDS_PEPPER_BROKER_MESSAGE,

+ plugin_metadata->name(),

+ net::FormatUrl(url_.GetOrigin(),

+ languages_));

}

base::string16 PepperBrokerInfoBarDelegate::GetButtonLabel(