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

Side by Side Diff: ui/events/ozone/device/udev/device_manager_udev.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, 1 month 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 unified diff | Download patch
« no previous file with comments | « device/usb/usb_device_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_ 5 #ifndef UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_
6 #define UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_ 6 #define UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_
7 7
8 #include "base/message_loop/message_pump_libevent.h" 8 #include "base/message_loop/message_pump_libevent.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "device/udev_linux/udev.h" 10 #include "device/udev_linux/scoped_udev.h"
11 #include "ui/events/ozone/device/device_manager.h" 11 #include "ui/events/ozone/device/device_manager.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 class DeviceEvent; 15 class DeviceEvent;
16 class DeviceEventObserver; 16 class DeviceEventObserver;
17 17
18 class DeviceManagerUdev 18 class DeviceManagerUdev
19 : public DeviceManager, base::MessagePumpLibevent::Watcher { 19 : public DeviceManager, base::MessagePumpLibevent::Watcher {
20 public: 20 public:
(...skipping 21 matching lines...) Expand all
42 base::MessagePumpLibevent::FileDescriptorWatcher controller_; 42 base::MessagePumpLibevent::FileDescriptorWatcher controller_;
43 43
44 ObserverList<DeviceEventObserver> observers_; 44 ObserverList<DeviceEventObserver> observers_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(DeviceManagerUdev); 46 DISALLOW_COPY_AND_ASSIGN(DeviceManagerUdev);
47 }; 47 };
48 48
49 } // namespace ui 49 } // namespace ui
50 50
51 #endif // UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_ 51 #endif // UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_
OLDNEW
« no previous file with comments | « device/usb/usb_device_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698