Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Side by Side Diff: device/usb/usb_device_filter.cc

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Hide //device/usb on mobile platforms. Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/usb_service/usb_device_filter.h" 5 #include "device/usb/usb_device_filter.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "components/usb_service/usb_device.h" 8 #include "device/usb/usb_device.h"
9 #include "components/usb_service/usb_device_handle.h" 9 #include "device/usb/usb_device_handle.h"
10 #include "components/usb_service/usb_interface.h" 10 #include "device/usb/usb_interface.h"
11 11
12 namespace usb_service { 12 namespace device {
13 13
14 namespace { 14 namespace {
15 15
16 const char kProductIdKey[] = "productId"; 16 const char kProductIdKey[] = "productId";
17 const char kVendorIdKey[] = "vendorId"; 17 const char kVendorIdKey[] = "vendorId";
18 const char kInterfaceClassKey[] = "interfaceClass"; 18 const char kInterfaceClassKey[] = "interfaceClass";
19 const char kInterfaceSubclassKey[] = "interfaceSubclass"; 19 const char kInterfaceSubclassKey[] = "interfaceSubclass";
20 const char kInterfaceProtocolKey[] = "interfaceProtocol"; 20 const char kInterfaceProtocolKey[] = "interfaceProtocol";
21 21
22 } // namespace 22 } // namespace
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 obj->SetInteger(kInterfaceSubclassKey, interface_subclass_); 118 obj->SetInteger(kInterfaceSubclassKey, interface_subclass_);
119 if (interface_protocol_set_) { 119 if (interface_protocol_set_) {
120 obj->SetInteger(kInterfaceProtocolKey, interface_protocol_); 120 obj->SetInteger(kInterfaceProtocolKey, interface_protocol_);
121 } 121 }
122 } 122 }
123 } 123 }
124 124
125 return obj.release(); 125 return obj.release();
126 } 126 }
127 127
128 } // namespace usb_service 128 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698