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

Unified Diff: content/browser/udev_linux.h

Issue 666653002: Cleanup: Merge device/udev_linux/udev.{cc,h} into device/udev_linux/scoped_udev.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc ('k') | content/browser/udev_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/udev_linux.h
diff --git a/content/browser/udev_linux.h b/content/browser/udev_linux.h
index e62d439c58ecce2aa1050406f233a78b746b35c4..5ced8ce315d8b9e3a613234c7a97da770df71139 100644
--- a/content/browser/udev_linux.h
+++ b/content/browser/udev_linux.h
@@ -42,6 +42,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_pump_libevent.h"
+#include "device/udev_linux/scoped_udev.h"
extern "C" {
struct udev;
@@ -83,8 +84,8 @@ class UdevLinux : public base::MessagePumpLibevent::Watcher {
// libudev-related items, the main context, and the monitoring context to be
// notified about changes to device states.
- udev* udev_;
- udev_monitor* monitor_;
+ device::ScopedUdevPtr udev_;
+ device::ScopedUdevMonitorPtr monitor_;
int monitor_fd_;
base::MessagePumpLibevent::FileDescriptorWatcher monitor_watcher_;
UdevNotificationCallback callback_;
« no previous file with comments | « content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc ('k') | content/browser/udev_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698