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

Side by Side Diff: webrtc/modules/desktop_capture/screen_drawer_linux.cc

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
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/x11/shared_x_display.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 #include <fcntl.h> 11 #include <fcntl.h>
12 #include <sys/stat.h> 12 #include <sys/stat.h>
13 #include <semaphore.h> 13 #include <semaphore.h>
14 #include <string.h> 14 #include <string.h>
15 #include <X11/Xlib.h>
15 16
16 #include <memory> 17 #include <memory>
17 18
18 #include "webrtc/base/checks.h" 19 #include "webrtc/base/checks.h"
19 #include "webrtc/modules/desktop_capture/screen_drawer.h" 20 #include "webrtc/modules/desktop_capture/screen_drawer.h"
20 #include "webrtc/modules/desktop_capture/x11/shared_x_display.h" 21 #include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
21 #include "webrtc/system_wrappers/include/sleep.h" 22 #include "webrtc/system_wrappers/include/sleep.h"
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 192
192 // static 193 // static
193 std::unique_ptr<ScreenDrawer> ScreenDrawer::Create() { 194 std::unique_ptr<ScreenDrawer> ScreenDrawer::Create() {
194 if (SharedXDisplay::CreateDefault().get()) { 195 if (SharedXDisplay::CreateDefault().get()) {
195 return std::unique_ptr<ScreenDrawer>(new ScreenDrawerLinux()); 196 return std::unique_ptr<ScreenDrawer>(new ScreenDrawerLinux());
196 } 197 }
197 return nullptr; 198 return nullptr;
198 } 199 }
199 200
200 } // namespace webrtc 201 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/x11/shared_x_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698