Index: webrtc/modules/desktop_capture/window_capturer_mac.mm |
diff --git a/webrtc/modules/desktop_capture/window_capturer_mac.mm b/webrtc/modules/desktop_capture/window_capturer_mac.mm |
index daa9fc785863573a3fd89dcab85d65ce64b81d3f..3acca67cb041ef5dd2ea59b31b3375d2954ede51 100644 |
--- a/webrtc/modules/desktop_capture/window_capturer_mac.mm |
+++ b/webrtc/modules/desktop_capture/window_capturer_mac.mm |
@@ -16,13 +16,13 @@ |
#include <CoreFoundation/CoreFoundation.h> |
#include "webrtc/base/macutils.h" |
+#include "webrtc/base/scoped_ref_ptr.h" |
#include "webrtc/modules/desktop_capture/desktop_capture_options.h" |
#include "webrtc/modules/desktop_capture/desktop_frame.h" |
#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" |
#include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" |
#include "webrtc/modules/desktop_capture/mac/window_list_utils.h" |
#include "webrtc/system_wrappers/interface/logging.h" |
-#include "webrtc/system_wrappers/interface/scoped_refptr.h" |
#include "webrtc/system_wrappers/interface/tick_util.h" |
namespace webrtc { |
@@ -44,9 +44,8 @@ bool IsWindowValid(CGWindowID id) { |
class WindowCapturerMac : public WindowCapturer { |
public: |
- explicit WindowCapturerMac( |
- scoped_refptr<FullScreenChromeWindowDetector> |
- full_screen_chrome_window_detector); |
+ explicit WindowCapturerMac(rtc::scoped_refptr<FullScreenChromeWindowDetector> |
+ full_screen_chrome_window_detector); |
virtual ~WindowCapturerMac(); |
// WindowCapturer interface. |
@@ -64,15 +63,14 @@ class WindowCapturerMac : public WindowCapturer { |
// The window being captured. |
CGWindowID window_id_; |
- scoped_refptr<FullScreenChromeWindowDetector> |
+ rtc::scoped_refptr<FullScreenChromeWindowDetector> |
full_screen_chrome_window_detector_; |
DISALLOW_COPY_AND_ASSIGN(WindowCapturerMac); |
}; |
-WindowCapturerMac::WindowCapturerMac( |
- scoped_refptr<FullScreenChromeWindowDetector> |
- full_screen_chrome_window_detector) |
+WindowCapturerMac::WindowCapturerMac(rtc::scoped_refptr< |
+ FullScreenChromeWindowDetector> full_screen_chrome_window_detector) |
: callback_(NULL), |
window_id_(0), |
full_screen_chrome_window_detector_(full_screen_chrome_window_detector) { |