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

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

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 <memory> 11 #include <memory>
12 12
13 #include "webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" 13 #include "webrtc/modules/desktop_capture/desktop_and_cursor_composer.h"
14 #include "webrtc/modules/desktop_capture/desktop_capturer.h" 14 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
15 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 15 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
16 #include "webrtc/modules/desktop_capture/desktop_frame.h" 16 #include "webrtc/modules/desktop_capture/desktop_frame.h"
17 #include "webrtc/modules/desktop_capture/mouse_cursor.h" 17 #include "webrtc/modules/desktop_capture/mouse_cursor.h"
18 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" 18 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
19 #include "webrtc/system_wrappers/include/logging.h"
20 #include "webrtc/test/gtest.h" 19 #include "webrtc/test/gtest.h"
21 20
22 namespace webrtc { 21 namespace webrtc {
23 22
24 namespace { 23 namespace {
25 24
26 const int kScreenWidth = 100; 25 const int kScreenWidth = 100;
27 const int kScreenHeight = 100; 26 const int kScreenHeight = 100;
28 const int kCursorWidth = 10; 27 const int kCursorWidth = 10;
29 const int kCursorHeight = 10; 28 const int kCursorHeight = 10;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 // Verify that the cursor is erased before the frame buffer is returned to 242 // Verify that the cursor is erased before the frame buffer is returned to
244 // the screen capturer. 243 // the screen capturer.
245 frame_.reset(); 244 frame_.reset();
246 VerifyFrame(*frame, MouseCursorMonitor::OUTSIDE, DesktopVector()); 245 VerifyFrame(*frame, MouseCursorMonitor::OUTSIDE, DesktopVector());
247 } 246 }
248 } 247 }
249 248
250 } // namespace 249 } // namespace
251 250
252 } // namespace webrtc 251 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/cropping_window_capturer_win.cc ('k') | webrtc/modules/desktop_capture/desktop_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698