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

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

Issue 2482963003: Remove evil defines out of shared_x_display.h (Closed)
Patch Set: Resolve review comments Created 4 years, 1 month 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>
18 #include <X11/Xlib.h>
19
20 #include <string> 17 #include <string>
21 18
22 #include "webrtc/base/constructormagic.h" 19 #include "webrtc/base/constructormagic.h"
23 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/base/scoped_ref_ptr.h"
24 #include "webrtc/system_wrappers/include/atomic32.h" 21 #include "webrtc/system_wrappers/include/atomic32.h"
25 22
23 // Including Xlib.h will involve evil defines (Bool, Status, True, False), which
24 // easily conflict with other headers.
25 typedef struct _XDisplay Display;
26 typedef union _XEvent XEvent;
27
26 namespace webrtc { 28 namespace webrtc {
27 29
28 // A ref-counted object to store XDisplay connection. 30 // A ref-counted object to store XDisplay connection.
29 class SharedXDisplay { 31 class SharedXDisplay {
30 public: 32 public:
31 class XEventHandler { 33 class XEventHandler {
32 public: 34 public:
33 virtual ~XEventHandler() {} 35 virtual ~XEventHandler() {}
34 36
35 // Processes XEvent. Returns true if the event has been handled. 37 // Processes XEvent. Returns true if the event has been handled.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 Display* display_; 78 Display* display_;
77 79
78 EventHandlersMap event_handlers_; 80 EventHandlersMap event_handlers_;
79 81
80 RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); 82 RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay);
81 }; 83 };
82 84
83 } // namespace webrtc 85 } // namespace webrtc
84 86
85 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ 87 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_drawer_linux.cc ('k') | webrtc/modules/desktop_capture/x11/shared_x_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698