| OLD | NEW |
| 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 "extensions/common/permissions/usb_device_permission_data.h" | 5 #include "extensions/common/permissions/usb_device_permission_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <tuple> |
| 8 #include <vector> | 9 #include <vector> |
| 9 | 10 |
| 10 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
| 14 #include "base/values.h" | 15 #include "base/values.h" |
| 15 #include "extensions/common/permissions/api_permission.h" | 16 #include "extensions/common/permissions/api_permission.h" |
| 16 #include "extensions/common/permissions/usb_device_permission.h" | 17 #include "extensions/common/permissions/usb_device_permission.h" |
| 17 | 18 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 else if (temp < ANY_INTERFACE || temp > kuint8max) | 84 else if (temp < ANY_INTERFACE || temp > kuint8max) |
| 84 return false; | 85 return false; |
| 85 else | 86 else |
| 86 interface_id_ = temp; | 87 interface_id_ = temp; |
| 87 | 88 |
| 88 return true; | 89 return true; |
| 89 } | 90 } |
| 90 | 91 |
| 91 bool UsbDevicePermissionData::operator<( | 92 bool UsbDevicePermissionData::operator<( |
| 92 const UsbDevicePermissionData& rhs) const { | 93 const UsbDevicePermissionData& rhs) const { |
| 93 if (vendor_id_ == rhs.vendor_id_) { | 94 return std::tie(vendor_id_, product_id_, interface_id_) < |
| 94 if (product_id_ == rhs.product_id_) | 95 std::tie(rhs.vendor_id_, rhs.product_id_, rhs.interface_id_); |
| 95 return interface_id_ < rhs.interface_id_; | |
| 96 | |
| 97 return product_id_ < rhs.product_id_; | |
| 98 } | |
| 99 return vendor_id_ < rhs.vendor_id_; | |
| 100 } | 96 } |
| 101 | 97 |
| 102 bool UsbDevicePermissionData::operator==( | 98 bool UsbDevicePermissionData::operator==( |
| 103 const UsbDevicePermissionData& rhs) const { | 99 const UsbDevicePermissionData& rhs) const { |
| 104 return vendor_id_ == rhs.vendor_id_ && | 100 return vendor_id_ == rhs.vendor_id_ && |
| 105 product_id_ == rhs.product_id_ && | 101 product_id_ == rhs.product_id_ && |
| 106 interface_id_ == rhs.interface_id_; | 102 interface_id_ == rhs.interface_id_; |
| 107 } | 103 } |
| 108 | 104 |
| 109 } // namespace extensions | 105 } // namespace extensions |
| OLD | NEW |