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

Side by Side Diff: webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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/scoped_thread_desktop.h" 11 #include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h"
12 12
13 #include "webrtc/system_wrappers/include/logging.h" 13 #include "webrtc/system_wrappers/include/logging.h"
14 14
15 #include "webrtc/modules/desktop_capture/win/desktop.h" 15 #include "webrtc/modules/desktop_capture/win/desktop.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 ScopedThreadDesktop::ScopedThreadDesktop() 19 ScopedThreadDesktop::ScopedThreadDesktop()
20 : initial_(Desktop::GetThreadDesktop()) { 20 : initial_(Desktop::GetThreadDesktop()) {
21 } 21 }
22 22
23 ScopedThreadDesktop::~ScopedThreadDesktop() { 23 ScopedThreadDesktop::~ScopedThreadDesktop() {
24 Revert(); 24 Revert();
25 } 25 }
26 26
27 bool ScopedThreadDesktop::IsSame(const Desktop& desktop) { 27 bool ScopedThreadDesktop::IsSame(const Desktop& desktop) {
28 if (assigned_.get() != NULL) { 28 if (assigned_.get() != nullptr) {
29 return assigned_->IsSame(desktop); 29 return assigned_->IsSame(desktop);
30 } else { 30 } else {
31 return initial_->IsSame(desktop); 31 return initial_->IsSame(desktop);
32 } 32 }
33 } 33 }
34 34
35 void ScopedThreadDesktop::Revert() { 35 void ScopedThreadDesktop::Revert() {
36 if (assigned_.get() != NULL) { 36 if (assigned_.get() != nullptr) {
37 initial_->SetThreadDesktop(); 37 initial_->SetThreadDesktop();
38 assigned_.reset(); 38 assigned_.reset();
39 } 39 }
40 } 40 }
41 41
42 bool ScopedThreadDesktop::SetThreadDesktop(Desktop* desktop) { 42 bool ScopedThreadDesktop::SetThreadDesktop(Desktop* desktop) {
43 Revert(); 43 Revert();
44 44
45 std::unique_ptr<Desktop> scoped_desktop(desktop); 45 std::unique_ptr<Desktop> scoped_desktop(desktop);
46 46
47 if (initial_->IsSame(*desktop)) 47 if (initial_->IsSame(*desktop))
48 return true; 48 return true;
49 49
50 if (!desktop->SetThreadDesktop()) 50 if (!desktop->SetThreadDesktop())
51 return false; 51 return false;
52 52
53 assigned_.reset(scoped_desktop.release()); 53 assigned_.reset(scoped_desktop.release());
54 return true; 54 return true;
55 } 55 }
56 56
57 } // namespace webrtc 57 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698