| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 21c29ee88d6e8de7a5b0ef351f2538673ef8f2d0..7ff0d2ab8039250a1a6005bb604516b497c259e5 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -154,11 +154,11 @@
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| -#include "media/capture/system_message_window_win.h"
|
| +#include "device/capture/system_message_window_win.h"
|
| #elif defined(OS_LINUX) && defined(USE_UDEV)
|
| -#include "media/capture/device_monitor_udev.h"
|
| +#include "device/capture/device_monitor_udev.h"
|
| #elif defined(OS_MACOSX)
|
| -#include "media/capture/device_monitor_mac.h"
|
| +#include "device/capture/device_monitor_mac.h"
|
| #endif
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| @@ -1277,12 +1277,12 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| }
|
|
|
| #if defined(OS_WIN)
|
| - system_message_window_.reset(new media::SystemMessageWindowWin);
|
| + system_message_window_.reset(new device::SystemMessageWindowWin);
|
| #elif defined(OS_LINUX) && defined(USE_UDEV)
|
| device_monitor_linux_.reset(
|
| - new media::DeviceMonitorLinux(io_thread_->task_runner()));
|
| + new device::DeviceMonitorUdev(io_thread_->task_runner()));
|
| #elif defined(OS_MACOSX)
|
| - device_monitor_mac_.reset(new media::DeviceMonitorMac());
|
| + device_monitor_mac_.reset(new device::DeviceMonitorMac());
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
|
|