diff options
| author | Peter Boström <pbos@webrtc.org> | 2015-06-04 15:18:17 +0200 |
|---|---|---|
| committer | Peter Boström <pbos@webrtc.org> | 2015-06-04 13:18:28 +0000 |
| commit | 26b08605e2b99136fcc1cab0800234f469d6e236 (patch) | |
| tree | e89bf8ef2ecd620cba1bcc7208fc814af5607684 /webrtc/modules/desktop_capture/shared_desktop_frame.h | |
| parent | 491bd534ef726456883ec372562d1c8fef82e7ca (diff) | |
| download | webrtc-26b08605e2b99136fcc1cab0800234f469d6e236.tar.gz | |
Use one scoped_refptr.
Uses webrtc/base/scoped_ref_ptr.h and removes the copy in
system_wrappers.
BUG=
R=kwiberg@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1152733005
Cr-Commit-Position: refs/heads/master@{#9370}
Diffstat (limited to 'webrtc/modules/desktop_capture/shared_desktop_frame.h')
| -rw-r--r-- | webrtc/modules/desktop_capture/shared_desktop_frame.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.h b/webrtc/modules/desktop_capture/shared_desktop_frame.h index d77cb15b4d..12d373a0f3 100644 --- a/webrtc/modules/desktop_capture/shared_desktop_frame.h +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ +#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/system_wrappers/interface/scoped_refptr.h" namespace webrtc { @@ -37,9 +37,9 @@ class SharedDesktopFrame : public DesktopFrame { private: class Core; - SharedDesktopFrame(scoped_refptr<Core> core); + SharedDesktopFrame(rtc::scoped_refptr<Core> core); - scoped_refptr<Core> core_; + rtc::scoped_refptr<Core> core_; DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame); }; |