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

Side by Side Diff: chrome/browser/usb/usb_device.h

Issue 10991039: Fixing use of deprecated DISALLOW_EVIL_CONSTRUCTORS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/usb/usb_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_DEVICE_H_ 5 #ifndef CHROME_BROWSER_USB_USB_DEVICE_H_
6 #define CHROME_BROWSER_USB_USB_DEVICE_H_ 6 #define CHROME_BROWSER_USB_USB_DEVICE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // have outlived its originating UsbService. 129 // have outlived its originating UsbService.
130 UsbService* const service_; 130 UsbService* const service_;
131 PlatformUsbDeviceHandle handle_; 131 PlatformUsbDeviceHandle handle_;
132 132
133 // transfers_ tracks all in-flight transfers associated with this device, 133 // transfers_ tracks all in-flight transfers associated with this device,
134 // allowing the device to retain the buffer and callback associated with a 134 // allowing the device to retain the buffer and callback associated with a
135 // transfer until such time that it completes. It is protected by lock_. 135 // transfer until such time that it completes. It is protected by lock_.
136 base::Lock lock_; 136 base::Lock lock_;
137 std::map<PlatformUsbTransferHandle, Transfer> transfers_; 137 std::map<PlatformUsbTransferHandle, Transfer> transfers_;
138 138
139 DISALLOW_EVIL_CONSTRUCTORS(UsbDevice); 139 DISALLOW_COPY_AND_ASSIGN(UsbDevice);
140 }; 140 };
141 141
142 #endif // CHROME_BROWSER_USB_USB_DEVICE_H_ 142 #endif // CHROME_BROWSER_USB_USB_DEVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/usb/usb_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698