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

Side by Side Diff: webrtc/modules/desktop_capture/x11/shared_x_display.h

Issue 1917043005: #include "webrtc/base/constructormagic.h" where appropriate (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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 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
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_
13 13
14 #include <map> 14 #include <map>
15 #include <vector> 15 #include <vector>
16 16
17 #include <assert.h> 17 #include <assert.h>
18 #include <X11/Xlib.h> 18 #include <X11/Xlib.h>
19 19
20 #include <string> 20 #include <string>
21 21
22 #include "webrtc/base/constructormagic.h"
22 #include "webrtc/base/scoped_ref_ptr.h" 23 #include "webrtc/base/scoped_ref_ptr.h"
23 #include "webrtc/system_wrappers/include/atomic32.h" 24 #include "webrtc/system_wrappers/include/atomic32.h"
24 25
25 namespace webrtc { 26 namespace webrtc {
26 27
27 // A ref-counted object to store XDisplay connection. 28 // A ref-counted object to store XDisplay connection.
28 class SharedXDisplay { 29 class SharedXDisplay {
29 public: 30 public:
30 class XEventHandler { 31 class XEventHandler {
31 public: 32 public:
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 Display* display_; 76 Display* display_;
76 77
77 EventHandlersMap event_handlers_; 78 EventHandlersMap event_handlers_;
78 79
79 RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); 80 RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay);
80 }; 81 };
81 82
82 } // namespace webrtc 83 } // namespace webrtc
83 84
84 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ 85 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/window_capturer_x11.cc ('k') | webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698