| Index: device/capture/device_monitor_udev.cc
|
| diff --git a/media/capture/device_monitor_udev.cc b/device/capture/device_monitor_udev.cc
|
| similarity index 81%
|
| rename from media/capture/device_monitor_udev.cc
|
| rename to device/capture/device_monitor_udev.cc
|
| index a010427d0be260694d7c90ecc106d3dac960e91a..839889ccf24697a1b4ff55ef005a07b02e63e2f2 100644
|
| --- a/media/capture/device_monitor_udev.cc
|
| +++ b/device/capture/device_monitor_udev.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| // libudev is used for monitoring device changes.
|
|
|
| -#include "media/capture/device_monitor_udev.h"
|
| +#include "device/capture/device_monitor_udev.h"
|
|
|
| #include <stddef.h>
|
|
|
| @@ -34,19 +34,19 @@ const SubsystemMap kSubsystemMap[] = {
|
|
|
| } // namespace
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| -DeviceMonitorLinux::DeviceMonitorLinux(
|
| +DeviceMonitorUdev::DeviceMonitorUdev(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
|
| : io_task_runner_(io_task_runner) {
|
| io_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DeviceMonitorLinux::Initialize, base::Unretained(this)));
|
| + base::Bind(&DeviceMonitorUdev::Initialize, base::Unretained(this)));
|
| }
|
|
|
| -DeviceMonitorLinux::~DeviceMonitorLinux() {}
|
| +DeviceMonitorUdev::~DeviceMonitorUdev() {}
|
|
|
| -void DeviceMonitorLinux::Initialize() {
|
| +void DeviceMonitorUdev::Initialize() {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
|
|
| // We want to be notified of IO message loop destruction to delete |udev_|.
|
| @@ -58,16 +58,16 @@ void DeviceMonitorLinux::Initialize() {
|
| device::UdevLinux::UdevMonitorFilter(entry.subsystem, entry.devtype));
|
| }
|
| udev_.reset(new device::UdevLinux(
|
| - filters, base::Bind(&DeviceMonitorLinux::OnDevicesChanged,
|
| + filters, base::Bind(&DeviceMonitorUdev::OnDevicesChanged,
|
| base::Unretained(this))));
|
| }
|
|
|
| -void DeviceMonitorLinux::WillDestroyCurrentMessageLoop() {
|
| +void DeviceMonitorUdev::WillDestroyCurrentMessageLoop() {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| udev_.reset();
|
| }
|
|
|
| -void DeviceMonitorLinux::OnDevicesChanged(udev_device* device) {
|
| +void DeviceMonitorUdev::OnDevicesChanged(udev_device* device) {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| DCHECK(device);
|
|
|
| @@ -85,4 +85,4 @@ void DeviceMonitorLinux::OnDevicesChanged(udev_device* device) {
|
| base::SystemMonitor::Get()->ProcessDevicesChanged(device_type);
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|