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

Unified Diff: ui/events/ozone/device/udev/device_manager_udev.h

Issue 302093009: Linux: Unify udev scopers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « ui/events/ozone/device/device_manager.cc ('k') | ui/events/ozone/device/udev/device_manager_udev.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/device/udev/device_manager_udev.h
diff --git a/ui/events/ozone/device/udev/device_manager_udev.h b/ui/events/ozone/device/udev/device_manager_udev.h
index 7c15e3b760e9d1db89718728b0f6d89d27cca27b..8a7537abebe40b73c31fc0f0f79fc67b96192bba 100644
--- a/ui/events/ozone/device/udev/device_manager_udev.h
+++ b/ui/events/ozone/device/udev/device_manager_udev.h
@@ -7,8 +7,8 @@
#include "base/message_loop/message_pump_libevent.h"
#include "base/observer_list.h"
+#include "device/udev_linux/udev.h"
#include "ui/events/ozone/device/device_manager.h"
-#include "ui/events/ozone/device/udev/scoped_udev.h"
namespace ui {
@@ -36,8 +36,8 @@ class DeviceManagerUdev
virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
- scoped_udev udev_;
- scoped_udev_monitor monitor_;
+ device::ScopedUdevPtr udev_;
+ device::ScopedUdevMonitorPtr monitor_;
base::MessagePumpLibevent::FileDescriptorWatcher controller_;
« no previous file with comments | « ui/events/ozone/device/device_manager.cc ('k') | ui/events/ozone/device/udev/device_manager_udev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698