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

Unified Diff: device/hid/hid_connection_mac.cc

Issue 947663002: Log device/hid messages to chrome://device-log. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clarified destructor behavior, cleaned up OS X error logging. Created 5 years, 10 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
Index: device/hid/hid_connection_mac.cc
diff --git a/device/hid/hid_connection_mac.cc b/device/hid/hid_connection_mac.cc
index fe485f7ec7f931e51187e75b7c81e4b1ab8eda25..de93cc66da34f6b6ca194fd3b20a2dbab0ac3bad 100644
--- a/device/hid/hid_connection_mac.cc
+++ b/device/hid/hid_connection_mac.cc
@@ -10,10 +10,19 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/stringprintf.h"
#include "base/thread_task_runner_handle.h"
+#include "components/device_event_log/device_event_log.h"
#include "device/hid/hid_connection_mac.h"
namespace device {
+namespace {
+
+std::string HexErrorCode(IOReturn error_code) {
+ return base::StringPrintf("0x%04x", error_code);
+}
+
+} // namespace
+
HidConnectionMac::HidConnectionMac(
IOHIDDeviceRef device,
scoped_refptr<HidDeviceInfo> device_info,
@@ -59,8 +68,7 @@ void HidConnectionMac::PlatformClose() {
device_.get(), CFRunLoopGetMain(), kCFRunLoopDefaultMode);
IOReturn result = IOHIDDeviceClose(device_.get(), 0);
if (result != kIOReturnSuccess) {
- VLOG(1) << "Failed to close HID device: "
- << base::StringPrintf("0x%04x", result);
+ HID_LOG(EVENT) << "Failed to close HID device: " << HexErrorCode(result);
}
while (!pending_reads_.empty()) {
@@ -120,8 +128,7 @@ void HidConnectionMac::InputReportCallback(void* context,
CFIndex report_length) {
HidConnectionMac* connection = static_cast<HidConnectionMac*>(context);
if (result != kIOReturnSuccess) {
- VLOG(1) << "Failed to read input report: "
- << base::StringPrintf("0x%08x", result);
+ HID_LOG(EVENT) << "Failed to read input report: " << HexErrorCode(result);
return;
}
@@ -186,8 +193,7 @@ void HidConnectionMac::GetFeatureReportAsync(uint8_t report_id,
this,
base::Bind(callback, true, buffer, report_size)));
} else {
- VLOG(1) << "Failed to get feature report: "
- << base::StringPrintf("0x%08x", result);
+ HID_LOG(EVENT) << "Failed to get feature report: " << HexErrorCode(result);
task_runner_->PostTask(FROM_HERE,
base::Bind(&HidConnectionMac::ReturnAsyncResult,
this,
@@ -222,7 +228,7 @@ void HidConnectionMac::SetReportAsync(IOHIDReportType report_type,
this,
base::Bind(callback, true)));
} else {
- VLOG(1) << "Failed to set report: " << base::StringPrintf("0x%08x", result);
+ HID_LOG(EVENT) << "Failed to set report: " << HexErrorCode(result);
task_runner_->PostTask(FROM_HERE,
base::Bind(&HidConnectionMac::ReturnAsyncResult,
this,

Powered by Google App Engine
This is Rietveld 408576698