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

Unified Diff: device/capture/device_monitor_mac.mm

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « device/capture/device_monitor_mac.h ('k') | device/capture/device_monitor_udev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/device_monitor_mac.mm
diff --git a/media/capture/device_monitor_mac.mm b/device/capture/device_monitor_mac.mm
similarity index 98%
rename from media/capture/device_monitor_mac.mm
rename to device/capture/device_monitor_mac.mm
index 2ff63e0adcca95bf05e0c00ee319ffe45605c8d5..42b6074fe157656c523bb69f50eb02a8320887be 100644
--- a/media/capture/device_monitor_mac.mm
+++ b/device/capture/device_monitor_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/capture/device_monitor_mac.h"
+#include "device/capture/device_monitor_mac.h"
#include <set>
@@ -45,7 +45,7 @@ class DeviceInfo {
// Base abstract class used by DeviceMonitorMac.
class DeviceMonitorMacImpl {
public:
- explicit DeviceMonitorMacImpl(media::DeviceMonitorMac* monitor)
+ explicit DeviceMonitorMacImpl(device::DeviceMonitorMac* monitor)
: monitor_(monitor),
cached_devices_(),
device_arrival_(nil),
@@ -69,7 +69,7 @@ class DeviceMonitorMacImpl {
const std::vector<DeviceInfo>& snapshot_devices);
protected:
- media::DeviceMonitorMac* monitor_;
+ device::DeviceMonitorMac* monitor_;
std::vector<DeviceInfo> cached_devices_;
// Handles to NSNotificationCenter block observers.
@@ -297,7 +297,7 @@ void SuspendObserverDelegate::DoOnDeviceChanged(NSArray* devices) {
class AVFoundationMonitorImpl : public DeviceMonitorMacImpl {
public:
AVFoundationMonitorImpl(
- media::DeviceMonitorMac* monitor,
+ device::DeviceMonitorMac* monitor,
const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner);
~AVFoundationMonitorImpl() override;
@@ -317,7 +317,7 @@ class AVFoundationMonitorImpl : public DeviceMonitorMacImpl {
};
AVFoundationMonitorImpl::AVFoundationMonitorImpl(
- media::DeviceMonitorMac* monitor,
+ device::DeviceMonitorMac* monitor,
const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner)
: DeviceMonitorMacImpl(monitor),
device_task_runner_(device_task_runner),
@@ -437,7 +437,7 @@ void AVFoundationMonitorImpl::OnDeviceChanged() {
@end // @implementation CrAVFoundationDeviceObserver
-namespace media {
+namespace device {
DeviceMonitorMac::DeviceMonitorMac() {
// AVFoundation do not need to be fired up until the user
@@ -472,4 +472,4 @@ void DeviceMonitorMac::NotifyDeviceChanged(
base::SystemMonitor::Get()->ProcessDevicesChanged(type);
}
-} // namespace media
+} // namespace device
« no previous file with comments | « device/capture/device_monitor_mac.h ('k') | device/capture/device_monitor_udev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698