Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: webrtc/modules/desktop_capture/x11/shared_x_display.cc

Issue 1152733005: Use one scoped_refptr. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove from BUILD.gn Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/desktop_capture/x11/shared_x_display.cc
diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.cc b/webrtc/modules/desktop_capture/x11/shared_x_display.cc
index 05b7f572e0b22a12e9b7c8b7aa93960d8d9f30ac..9383715eda5885856a598b259a66afae54f9ffa3 100644
--- a/webrtc/modules/desktop_capture/x11/shared_x_display.cc
+++ b/webrtc/modules/desktop_capture/x11/shared_x_display.cc
@@ -27,7 +27,7 @@ SharedXDisplay::~SharedXDisplay() {
}
// static
-scoped_refptr<SharedXDisplay> SharedXDisplay::Create(
+rtc::scoped_refptr<SharedXDisplay> SharedXDisplay::Create(
const std::string& display_name) {
Display* display =
XOpenDisplay(display_name.empty() ? NULL : display_name.c_str());
@@ -39,7 +39,7 @@ scoped_refptr<SharedXDisplay> SharedXDisplay::Create(
}
// static
-scoped_refptr<SharedXDisplay> SharedXDisplay::CreateDefault() {
+rtc::scoped_refptr<SharedXDisplay> SharedXDisplay::CreateDefault() {
return Create(std::string());
}
@@ -64,7 +64,7 @@ void SharedXDisplay::RemoveEventHandler(int type, XEventHandler* handler) {
void SharedXDisplay::ProcessPendingXEvents() {
// Hold reference to |this| to prevent it from being destroyed while
// processing events.
- scoped_refptr<SharedXDisplay> self(this);
+ rtc::scoped_refptr<SharedXDisplay> self(this);
// Find the number of events that are outstanding "now." We don't just loop
// on XPending because we want to guarantee this terminates.
« no previous file with comments | « webrtc/modules/desktop_capture/x11/shared_x_display.h ('k') | webrtc/modules/rtp_rtcp/source/forward_error_correction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698