device/devices_app/usb/device_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_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: renamed some functions 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/devtools/device/usb/android_usb_device.cc ('k') | device/devices_app/usb/device_impl_unittest.cc » ('j') | device/usb/usb_device_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/devices_app/usb/device_impl.cc

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

index e8b299b86b77f69da4f8992d90bc413cf13d89ab..213f1cfb79c761a45ee66d16fc936f0db61978f5 100644

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

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

@@ -123,7 +123,7 @@ void DeviceImpl::GetDeviceInfo(const GetDeviceInfoCallback& callback) {

// but GetConfiguration() is non-const so we do it here for now.

DeviceInfoPtr info = DeviceInfo::From(*device_handle_->GetDevice());

const UsbConfigDescriptor* config =

- device_handle_->GetDevice()->GetConfiguration();

+ device_handle_->GetDevice()->GetActiveConfiguration();

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

if (config)

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