chrome/browser/ui/website_settings/website_settings.cc - Issue 2185213002: Display USB devices in the site settings popup on Android.

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/ui/website_settings/website_settings.cc

Issue 2185213002: Display USB devices in the site settings popup on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Replaced code to free chosen objects. Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 0fa5f8ff5df8aa0a334e498e0d2af7895840533e..82c18027c0676ebd25806a1419293a5710aec3c0 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -201,8 +201,8 @@ ChooserContextBase* GetUsbChooserContext(Profile* profile) {

// Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it,

// email security-dev@chromium.org.

WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {

- {&GetUsbChooserContext, IDR_BLOCKED_USB, IDR_ALLOWED_USB,

- IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,

+ {CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, &GetUsbChooserContext,

+ IDR_BLOCKED_USB, IDR_ALLOWED_USB, IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,

IDS_WEBSITE_SETTINGS_DELETE_USB_DEVICE, "name"},

};

« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.h ('k') | no next file » | no next file with comments »