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

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

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 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
(...skipping 13 matching lines...) Expand all
24 #include "webrtc/base/scoped_ptr.h" 24 #include "webrtc/base/scoped_ptr.h"
25 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 25 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
26 #include "webrtc/modules/desktop_capture/desktop_frame.h" 26 #include "webrtc/modules/desktop_capture/desktop_frame.h"
27 #include "webrtc/modules/desktop_capture/desktop_geometry.h" 27 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
28 #include "webrtc/modules/desktop_capture/desktop_region.h" 28 #include "webrtc/modules/desktop_capture/desktop_region.h"
29 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" 29 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"
30 #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" 30 #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h"
31 #include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h" 31 #include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h"
32 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" 32 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
33 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" 33 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
34 #include "webrtc/system_wrappers/interface/logging.h" 34 #include "webrtc/system_wrappers/include/logging.h"
35 #include "webrtc/system_wrappers/interface/tick_util.h" 35 #include "webrtc/system_wrappers/include/tick_util.h"
36 36
37 namespace webrtc { 37 namespace webrtc {
38 38
39 namespace { 39 namespace {
40 40
41 // Definitions used to dynamic-link to deprecated OS 10.6 functions. 41 // Definitions used to dynamic-link to deprecated OS 10.6 functions.
42 const char* kApplicationServicesLibraryName = 42 const char* kApplicationServicesLibraryName =
43 "/System/Library/Frameworks/ApplicationServices.framework/" 43 "/System/Library/Frameworks/ApplicationServices.framework/"
44 "ApplicationServices"; 44 "ApplicationServices";
45 typedef void* (*CGDisplayBaseAddressFunc)(CGDirectDisplayID); 45 typedef void* (*CGDisplayBaseAddressFunc)(CGDirectDisplayID);
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 return NULL; 973 return NULL;
974 974
975 rtc::scoped_ptr<ScreenCapturerMac> capturer( 975 rtc::scoped_ptr<ScreenCapturerMac> capturer(
976 new ScreenCapturerMac(options.configuration_monitor())); 976 new ScreenCapturerMac(options.configuration_monitor()));
977 if (!capturer->Init()) 977 if (!capturer->Init())
978 capturer.reset(); 978 capturer.reset();
979 return capturer.release(); 979 return capturer.release();
980 } 980 }
981 981
982 } // namespace webrtc 982 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_helper.cc ('k') | webrtc/modules/desktop_capture/screen_capturer_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698