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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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 #include "webrtc/modules/desktop_capture/x11/shared_x_display.h" 11 #include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
12 12
13 #include <X11/Xlib.h> 13 #include <X11/Xlib.h>
14 14
15 #include <algorithm> 15 #include <algorithm>
16 16
17 #include "webrtc/rtc_base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/rtc_base/logging.h" 18 #include "webrtc/base/logging.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 SharedXDisplay::SharedXDisplay(Display* display) 22 SharedXDisplay::SharedXDisplay(Display* display)
23 : display_(display) { 23 : display_(display) {
24 RTC_DCHECK(display_); 24 RTC_DCHECK(display_);
25 } 25 }
26 26
27 SharedXDisplay::~SharedXDisplay() { 27 SharedXDisplay::~SharedXDisplay() {
28 RTC_DCHECK(event_handlers_.empty()); 28 RTC_DCHECK(event_handlers_.empty());
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 continue; 81 continue;
82 for (std::vector<XEventHandler*>::iterator it = handlers->second.begin(); 82 for (std::vector<XEventHandler*>::iterator it = handlers->second.begin();
83 it != handlers->second.end(); ++it) { 83 it != handlers->second.end(); ++it) {
84 if ((*it)->HandleXEvent(e)) 84 if ((*it)->HandleXEvent(e))
85 break; 85 break;
86 } 86 }
87 } 87 }
88 } 88 }
89 89
90 } // namespace webrtc 90 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/x11/shared_x_display.h ('k') | webrtc/modules/desktop_capture/x11/x_error_trap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698