Index: remoting/host/sas_injector_win.cc |
diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc |
index 663c08d0ff7c519d9f86af0c63d7ed1fa7fc07bc..a29d727402360ec1fd81d7059996fa68f5f9d60c 100644 |
--- a/remoting/host/sas_injector_win.cc |
+++ b/remoting/host/sas_injector_win.cc |
@@ -14,8 +14,8 @@ |
#include "base/utf_string_conversions.h" |
#include "base/win/registry.h" |
#include "base/win/windows_version.h" |
-#include "media/video/capture/screen/win/desktop.h" |
-#include "media/video/capture/screen/win/scoped_thread_desktop.h" |
+#include "third_party/webrtc/modules/desktop_capture/win/desktop.h" |
+#include "third_party/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" |
namespace remoting { |
@@ -190,16 +190,16 @@ bool SasInjectorXp::InjectSas() { |
const wchar_t kSasWindowClassName[] = L"SAS window class"; |
const wchar_t kSasWindowTitle[] = L"SAS window"; |
- scoped_ptr<media::Desktop> winlogon_desktop( |
- media::Desktop::GetDesktop(kWinlogonDesktopName)); |
+ scoped_ptr<webrtc::Desktop> winlogon_desktop( |
+ webrtc::Desktop::GetDesktop(kWinlogonDesktopName)); |
if (!winlogon_desktop.get()) { |
LOG_GETLASTERROR(ERROR) |
<< "Failed to open '" << kWinlogonDesktopName << "' desktop"; |
return false; |
} |
- media::ScopedThreadDesktop desktop; |
- if (!desktop.SetThreadDesktop(winlogon_desktop.Pass())) { |
+ webrtc::ScopedThreadDesktop desktop; |
+ if (!desktop.SetThreadDesktop(winlogon_desktop.release())) { |
LOG_GETLASTERROR(ERROR) |
<< "Failed to switch to '" << kWinlogonDesktopName << "' desktop"; |
return false; |