Index: webrtc/modules/desktop_capture/desktop_capture_options.h |
diff --git a/webrtc/modules/desktop_capture/desktop_capture_options.h b/webrtc/modules/desktop_capture/desktop_capture_options.h |
index 030cb2b77738ee9ff3df5a5905f2959db2cb6db1..68bb5884459ea13fe569a8e0d10483091f1f0450 100644 |
--- a/webrtc/modules/desktop_capture/desktop_capture_options.h |
+++ b/webrtc/modules/desktop_capture/desktop_capture_options.h |
@@ -11,7 +11,7 @@ |
#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ |
#include "webrtc/base/constructormagic.h" |
-#include "webrtc/system_wrappers/interface/scoped_refptr.h" |
+#include "webrtc/base/scoped_ref_ptr.h" |
#if defined(USE_X11) |
#include "webrtc/modules/desktop_capture/x11/shared_x_display.h" |
@@ -39,7 +39,7 @@ class DesktopCaptureOptions { |
#if defined(USE_X11) |
SharedXDisplay* x_display() const { return x_display_; } |
- void set_x_display(scoped_refptr<SharedXDisplay> x_display) { |
+ void set_x_display(rtc::scoped_refptr<SharedXDisplay> x_display) { |
x_display_ = x_display; |
} |
#endif |
@@ -48,7 +48,8 @@ class DesktopCaptureOptions { |
DesktopConfigurationMonitor* configuration_monitor() const { |
return configuration_monitor_; |
} |
- void set_configuration_monitor(scoped_refptr<DesktopConfigurationMonitor> m) { |
+ void set_configuration_monitor( |
+ rtc::scoped_refptr<DesktopConfigurationMonitor> m) { |
configuration_monitor_ = m; |
} |
@@ -56,7 +57,7 @@ class DesktopCaptureOptions { |
return full_screen_window_detector_; |
} |
void set_full_screen_chrome_window_detector( |
- scoped_refptr<FullScreenChromeWindowDetector> detector) { |
+ rtc::scoped_refptr<FullScreenChromeWindowDetector> detector) { |
full_screen_window_detector_ = detector; |
} |
#endif |
@@ -86,12 +87,13 @@ class DesktopCaptureOptions { |
private: |
#if defined(USE_X11) |
- scoped_refptr<SharedXDisplay> x_display_; |
+ rtc::scoped_refptr<SharedXDisplay> x_display_; |
#endif |
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
- scoped_refptr<DesktopConfigurationMonitor> configuration_monitor_; |
- scoped_refptr<FullScreenChromeWindowDetector> full_screen_window_detector_; |
+ rtc::scoped_refptr<DesktopConfigurationMonitor> configuration_monitor_; |
+ rtc::scoped_refptr<FullScreenChromeWindowDetector> |
+ full_screen_window_detector_; |
#endif |
#if defined(WEBRTC_WIN) |