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

Side by Side Diff: webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.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, 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 private: 69 private:
70 // SharedXDisplay::XEventHandler interface. 70 // SharedXDisplay::XEventHandler interface.
71 bool HandleXEvent(const XEvent& event) override; 71 bool HandleXEvent(const XEvent& event) override;
72 72
73 Display* display() { return x_display_->display(); } 73 Display* display() { return x_display_->display(); }
74 74
75 // Captures current cursor shape and stores it in |cursor_shape_|. 75 // Captures current cursor shape and stores it in |cursor_shape_|.
76 void CaptureCursor(); 76 void CaptureCursor();
77 77
78 scoped_refptr<SharedXDisplay> x_display_; 78 rtc::scoped_refptr<SharedXDisplay> x_display_;
79 Callback* callback_; 79 Callback* callback_;
80 Mode mode_; 80 Mode mode_;
81 Window window_; 81 Window window_;
82 82
83 bool have_xfixes_; 83 bool have_xfixes_;
84 int xfixes_event_base_; 84 int xfixes_event_base_;
85 int xfixes_error_base_; 85 int xfixes_error_base_;
86 86
87 rtc::scoped_ptr<MouseCursor> cursor_shape_; 87 rtc::scoped_ptr<MouseCursor> cursor_shape_;
88 }; 88 };
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 MouseCursorMonitor* MouseCursorMonitor::CreateForScreen( 223 MouseCursorMonitor* MouseCursorMonitor::CreateForScreen(
224 const DesktopCaptureOptions& options, 224 const DesktopCaptureOptions& options,
225 ScreenId screen) { 225 ScreenId screen) {
226 if (!options.x_display()) 226 if (!options.x_display())
227 return NULL; 227 return NULL;
228 return new MouseCursorMonitorX11( 228 return new MouseCursorMonitorX11(
229 options, DefaultRootWindow(options.x_display()->display())); 229 options, DefaultRootWindow(options.x_display()->display()));
230 } 230 }
231 231
232 } // namespace webrtc 232 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm ('k') | webrtc/modules/desktop_capture/screen_capturer_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698