diff options
| author | thestig <thestig@chromium.org> | 2014-10-23 17:21:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 00:21:27 +0000 |
| commit | 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (patch) | |
| tree | 7ba05b92cf1a1075f9dfc1c11171e96ce683cf3d /content/browser/udev_linux.h | |
| parent | 55196a2b4a303ddbc46f2b63b58c725f80710c9c (diff) | |
| download | chromium_src-62675d9fb31fb8cedc40f68e78e8445a74f362e7.zip chromium_src-62675d9fb31fb8cedc40f68e78e8445a74f362e7.tar.gz chromium_src-62675d9fb31fb8cedc40f68e78e8445a74f362e7.tar.bz2 | |
Cleanup: Merge device/udev_linux/udev.{cc,h} into device/udev_linux/scoped_udev.h.
- Update header files elsewhere.
- Use ScopedUdev*Ptr classes in more places.
BUG=415212
Review URL: https://codereview.chromium.org/666653002
Cr-Commit-Position: refs/heads/master@{#300999}
Diffstat (limited to 'content/browser/udev_linux.h')
| -rw-r--r-- | content/browser/udev_linux.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/udev_linux.h b/content/browser/udev_linux.h index e62d439..5ced8ce 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_; |