extensions/common/permissions/usb_device_permission.cc - Issue 1237873004: Revert of Move JoinString to the base namespace

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: extensions/common/permissions/usb_device_permission.cc

Issue 1237873004: Revert of Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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:

Index: extensions/common/permissions/usb_device_permission.cc

diff --git a/extensions/common/permissions/usb_device_permission.cc b/extensions/common/permissions/usb_device_permission.cc

index 59b28d564f40f53aa52a54485a0b550b573e0f49..4384b325cc3d3697fbde998130f2e3f62de2c774 100644

--- a/extensions/common/permissions/usb_device_permission.cc

+++ b/extensions/common/permissions/usb_device_permission.cc

@@ -117,11 +117,11 @@

}

if (messages) {

- messages->push_back(PermissionMessage(

- PermissionMessage::kUsbDevice,

- l10n_util::GetStringUTF16(

- IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),

- base::JoinString(details, base::ASCIIToUTF16("\n"))));

+ messages->push_back(

+ PermissionMessage(PermissionMessage::kUsbDevice,

+ l10n_util::GetStringUTF16(

+ IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),

+ JoinString(details, base::char16('\n'))));

}

if (ids) {

for (const auto& detail : details)