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

Unified Diff: trunk/src/device/hid/hid_connection_win.h

Issue 369923002: Revert 281133 "chrome.hid: enrich model with report IDs" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | « trunk/src/device/hid/hid_connection_mac.cc ('k') | trunk/src/device/hid/hid_connection_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/device/hid/hid_connection_win.h
===================================================================
--- trunk/src/device/hid/hid_connection_win.h (revision 281281)
+++ trunk/src/device/hid/hid_connection_win.h (working copy)
@@ -9,8 +9,12 @@
#include <set>
-#include "base/win/scoped_handle.h"
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/message_loop/message_loop.h"
+#include "base/threading/thread_checker.h"
#include "device/hid/hid_connection.h"
+#include "device/hid/hid_device_info.h"
namespace device {
@@ -20,36 +24,31 @@
public:
explicit HidConnectionWin(const HidDeviceInfo& device_info);
- // HidConnection implementation.
- virtual void PlatformRead(scoped_refptr<net::IOBufferWithSize> buffer,
- const IOCallback& callback) OVERRIDE;
- virtual void PlatformWrite(uint8_t report_id,
- scoped_refptr<net::IOBufferWithSize> buffer,
- const IOCallback& callback) OVERRIDE;
- virtual void PlatformGetFeatureReport(
- uint8_t report_id,
- scoped_refptr<net::IOBufferWithSize> buffer,
- const IOCallback& callback) OVERRIDE;
- virtual void PlatformSendFeatureReport(
- uint8_t report_id,
- scoped_refptr<net::IOBufferWithSize> buffer,
- const IOCallback& callback) OVERRIDE;
+ bool available() const;
- private:
- friend class HidServiceWin;
- friend struct PendingHidTransfer;
+ virtual void Read(scoped_refptr<net::IOBufferWithSize> buffer,
+ const IOCallback& callback) OVERRIDE;
+ virtual void Write(uint8_t report_id,
+ scoped_refptr<net::IOBufferWithSize> buffer,
+ const IOCallback& callback) OVERRIDE;
+ virtual void GetFeatureReport(uint8_t report_id,
+ scoped_refptr<net::IOBufferWithSize> buffer,
+ const IOCallback& callback) OVERRIDE;
+ virtual void SendFeatureReport(uint8_t report_id,
+ scoped_refptr<net::IOBufferWithSize> buffer,
+ const IOCallback& callback) OVERRIDE;
- ~HidConnectionWin();
-
- bool available() const { return file_.IsValid(); }
-
void OnTransferFinished(scoped_refptr<PendingHidTransfer> transfer);
void OnTransferCanceled(scoped_refptr<PendingHidTransfer> transfer);
- base::win::ScopedHandle file_;
+ private:
+ ~HidConnectionWin();
+ base::win::ScopedHandle file_;
std::set<scoped_refptr<PendingHidTransfer> > transfers_;
+ base::ThreadChecker thread_checker_;
+
DISALLOW_COPY_AND_ASSIGN(HidConnectionWin);
};
« no previous file with comments | « trunk/src/device/hid/hid_connection_mac.cc ('k') | trunk/src/device/hid/hid_connection_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698