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

Unified Diff: content/browser/browser_main_loop.h

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 | « content/browser/BUILD.gn ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index d05d176e7c3f2a0505ec7f60aec07453c3b8b78e..b9468650fb4cd5795cd24b8958230dc39e9733f3 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -35,16 +35,18 @@ class TraceEventSystemStatsMonitor;
} // namespace trace_event
} // namespace base
-namespace media {
+namespace device {
#if defined(OS_WIN)
class SystemMessageWindowWin;
#elif defined(OS_LINUX) && defined(USE_UDEV)
-class DeviceMonitorLinux;
-#endif
-class UserInputMonitor;
-#if defined(OS_MACOSX)
+class DeviceMonitorUdev;
+#elif defined(OS_MACOSX)
class DeviceMonitorMac;
#endif
+} // namespace device
+
+namespace media {
+class UserInputMonitor;
namespace midi {
class MidiManager;
} // namespace midi
@@ -152,7 +154,7 @@ class CONTENT_EXPORT BrowserMainLoop {
}
#if defined(OS_MACOSX) && !defined(OS_IOS)
- media::DeviceMonitorMac* device_monitor_mac() const {
+ device::DeviceMonitorMac* device_monitor_mac() const {
return device_monitor_mac_.get();
}
#endif
@@ -281,11 +283,11 @@ class CONTENT_EXPORT BrowserMainLoop {
std::unique_ptr<media::midi::MidiManager> midi_manager_;
#if defined(OS_WIN)
- std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
+ std::unique_ptr<device::SystemMessageWindowWin> system_message_window_;
#elif defined(OS_LINUX) && defined(USE_UDEV)
- std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
+ std::unique_ptr<device::DeviceMonitorUdev> device_monitor_linux_;
#elif defined(OS_MACOSX) && !defined(OS_IOS)
- std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
+ std::unique_ptr<device::DeviceMonitorMac> device_monitor_mac_;
#endif
#if defined(USE_OZONE)
std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698