| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_USB_USB_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_USB_USB_SERVICE_H_ |
| 6 #define CHROME_BROWSER_USB_USB_SERVICE_H_ | 6 #define CHROME_BROWSER_USB_USB_SERVICE_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 PlatformUsbContext context_; | 51 PlatformUsbContext context_; |
| 52 UsbEventHandler *event_handler_; | 52 UsbEventHandler *event_handler_; |
| 53 | 53 |
| 54 // The devices_ map contains scoped_refptrs to all open devices, indicated by | 54 // The devices_ map contains scoped_refptrs to all open devices, indicated by |
| 55 // their vendor and product id. This allows for reusing an open device without | 55 // their vendor and product id. This allows for reusing an open device without |
| 56 // creating another platform handle for it. | 56 // creating another platform handle for it. |
| 57 typedef std::map<std::pair<uint16, uint16>, scoped_refptr<UsbDevice> > | 57 typedef std::map<std::pair<uint16, uint16>, scoped_refptr<UsbDevice> > |
| 58 DeviceMap; | 58 DeviceMap; |
| 59 DeviceMap devices_; | 59 DeviceMap devices_; |
| 60 | 60 |
| 61 DISALLOW_EVIL_CONSTRUCTORS(UsbService); | 61 DISALLOW_COPY_AND_ASSIGN(UsbService); |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 #endif // CHROME_BROWSER_USB_USB_SERVICE_H_ | 64 #endif // CHROME_BROWSER_USB_USB_SERVICE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10991039:
Fixing use of deprecated DISALLOW_EVIL_CONSTRUCTORS (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src