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

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

Issue 2781343002: Replace use of system_wrappers/include/logging.h by base/logging.h. (Closed)
Patch Set: Rebased. Created 3 years, 8 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/mouse_cursor_monitor.h" 11 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include <memory> 15 #include <memory>
16 16
17 #include <ApplicationServices/ApplicationServices.h> 17 #include <ApplicationServices/ApplicationServices.h>
18 #include <Cocoa/Cocoa.h> 18 #include <Cocoa/Cocoa.h>
19 #include <CoreFoundation/CoreFoundation.h> 19 #include <CoreFoundation/CoreFoundation.h>
20 20
21 #include "webrtc/base/macutils.h" 21 #include "webrtc/base/macutils.h"
22 #include "webrtc/base/scoped_ref_ptr.h" 22 #include "webrtc/base/scoped_ref_ptr.h"
23 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 23 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
24 #include "webrtc/modules/desktop_capture/desktop_frame.h" 24 #include "webrtc/modules/desktop_capture/desktop_frame.h"
25 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" 25 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"
26 #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" 26 #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h"
27 #include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector. h" 27 #include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector. h"
28 #include "webrtc/modules/desktop_capture/mouse_cursor.h" 28 #include "webrtc/modules/desktop_capture/mouse_cursor.h"
29 #include "webrtc/system_wrappers/include/logging.h"
30 29
31 namespace webrtc { 30 namespace webrtc {
32 31
33 namespace { 32 namespace {
34 // Paint the image, so that we can get a bitmap representation compatible with 33 // Paint the image, so that we can get a bitmap representation compatible with
35 // current context. For example, in the retina display, we are going to get an 34 // current context. For example, in the retina display, we are going to get an
36 // image with same visual size but underlying pixel size conforms to the retina 35 // image with same visual size but underlying pixel size conforms to the retina
37 // setting. 36 // setting.
38 NSImage* PaintInCurrentContext(NSImage* source) { 37 NSImage* PaintInCurrentContext(NSImage* source) {
39 NSSize size = [source size]; 38 NSSize size = [source size];
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 return new MouseCursorMonitorMac(options, window, kInvalidScreenId); 317 return new MouseCursorMonitorMac(options, window, kInvalidScreenId);
319 } 318 }
320 319
321 MouseCursorMonitor* MouseCursorMonitor::CreateForScreen( 320 MouseCursorMonitor* MouseCursorMonitor::CreateForScreen(
322 const DesktopCaptureOptions& options, 321 const DesktopCaptureOptions& options,
323 ScreenId screen) { 322 ScreenId screen) {
324 return new MouseCursorMonitorMac(options, kCGNullWindowID, screen); 323 return new MouseCursorMonitorMac(options, kCGNullWindowID, screen);
325 } 324 }
326 325
327 } // namespace webrtc 326 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698