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

Side by Side Diff: webrtc/modules/desktop_capture/win/desktop.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 "webrtc/modules/desktop_capture/win/desktop.h" 11 #include "webrtc/modules/desktop_capture/win/desktop.h"
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "webrtc/system_wrappers/include/logging.h" 15 #include "webrtc/base/logging.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 Desktop::Desktop(HDESK desktop, bool own) : desktop_(desktop), own_(own) { 19 Desktop::Desktop(HDESK desktop, bool own) : desktop_(desktop), own_(own) {
20 } 20 }
21 21
22 Desktop::~Desktop() { 22 Desktop::~Desktop() {
23 if (own_ && desktop_ != NULL) { 23 if (own_ && desktop_ != NULL) {
24 if (!::CloseDesktop(desktop_)) { 24 if (!::CloseDesktop(desktop_)) {
25 LOG(LS_ERROR) << "Failed to close the owned desktop handle: " 25 LOG(LS_ERROR) << "Failed to close the owned desktop handle: "
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 LOG(LS_ERROR) << "Failed to retrieve the handle of the desktop assigned to " 101 LOG(LS_ERROR) << "Failed to retrieve the handle of the desktop assigned to "
102 "the current thread: " 102 "the current thread: "
103 << GetLastError(); 103 << GetLastError();
104 return NULL; 104 return NULL;
105 } 105 }
106 106
107 return new Desktop(desktop, false); 107 return new Desktop(desktop, false);
108 } 108 }
109 109
110 } // namespace webrtc 110 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/win/d3d_device.cc ('k') | webrtc/modules/desktop_capture/win/dxgi_texture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698