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

Side by Side Diff: webrtc/modules/desktop_capture/screen_capturer_mac.mm

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 #include "webrtc/modules/desktop_capture/screen_capturer.h" 11 #include "webrtc/modules/desktop_capture/screen_capturer.h"
12 12
13 #include <stddef.h> 13 #include <stddef.h>
14 14
15 #include <memory> 15 #include <memory>
16 #include <set> 16 #include <set>
17 17
18 #include <ApplicationServices/ApplicationServices.h> 18 #include <ApplicationServices/ApplicationServices.h>
19 #include <Cocoa/Cocoa.h> 19 #include <Cocoa/Cocoa.h>
20 #include <dlfcn.h> 20 #include <dlfcn.h>
21 #include <IOKit/pwr_mgt/IOPMLib.h> 21 #include <IOKit/pwr_mgt/IOPMLib.h>
22 #include <OpenGL/CGLMacro.h> 22 #include <OpenGL/CGLMacro.h>
23 #include <OpenGL/OpenGL.h> 23 #include <OpenGL/OpenGL.h>
24 24
25 #include "webrtc/base/checks.h" 25 #include "webrtc/base/checks.h"
26 #include "webrtc/base/constructormagic.h"
26 #include "webrtc/base/macutils.h" 27 #include "webrtc/base/macutils.h"
27 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 28 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
28 #include "webrtc/modules/desktop_capture/desktop_frame.h" 29 #include "webrtc/modules/desktop_capture/desktop_frame.h"
29 #include "webrtc/modules/desktop_capture/desktop_geometry.h" 30 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
30 #include "webrtc/modules/desktop_capture/desktop_region.h" 31 #include "webrtc/modules/desktop_capture/desktop_region.h"
31 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" 32 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"
32 #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" 33 #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h"
33 #include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h" 34 #include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h"
34 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" 35 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
35 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" 36 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 return NULL; 985 return NULL;
985 986
986 std::unique_ptr<ScreenCapturerMac> capturer( 987 std::unique_ptr<ScreenCapturerMac> capturer(
987 new ScreenCapturerMac(options.configuration_monitor())); 988 new ScreenCapturerMac(options.configuration_monitor()));
988 if (!capturer->Init()) 989 if (!capturer->Init())
989 capturer.reset(); 990 capturer.reset();
990 return capturer.release(); 991 return capturer.release();
991 } 992 }
992 993
993 } // namespace webrtc 994 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_helper.h ('k') | webrtc/modules/desktop_capture/screen_capturer_mock_objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698