device/devices_app/usb/device_manager_impl.cc - Issue 1265833005: Get all the UsbConfigDescriptor for the device configuration

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: device/devices_app/usb/device_manager_impl.cc

Issue 1265833005: Get all the UsbConfigDescriptor for the device configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updated chromeos related code again 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:

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

Download patch

Index: device/devices_app/usb/device_manager_impl.cc

diff --git a/device/devices_app/usb/device_manager_impl.cc b/device/devices_app/usb/device_manager_impl.cc

index da3681b18d5834c3cf668e56f4fce570b461c8a3..2c150aa7a02936348c409ea026af0c2af900bbec 100644

--- a/device/devices_app/usb/device_manager_impl.cc

+++ b/device/devices_app/usb/device_manager_impl.cc

@@ -146,7 +146,7 @@ void DeviceManagerImpl::OnGetDevices(

DeviceInfoPtr device_info = DeviceInfo::From(*devices[i]);

if (UsbDeviceFilter::MatchesAny(devices[i], filters) &&

delegate_->IsDeviceAllowed(*device_info)) {

- const UsbConfigDescriptor* config = devices[i]->GetConfiguration();

+ const UsbConfigDescriptor* config = devices[i]->GetCurrentConfiguration();

device_info->configurations = mojo::Array<ConfigurationInfoPtr>::New(0);

if (config)

device_info->configurations.push_back(ConfigurationInfo::From(*config));

« no previous file with comments | « device/devices_app/usb/device_impl_unittest.cc ('k') | device/devices_app/usb/device_manager_impl_unittest.cc » ('j') | device/usb/usb_device.h » ('J')