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

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

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 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
(...skipping 24 matching lines...) Expand all
35 void ScopedThreadDesktop::Revert() { 35 void ScopedThreadDesktop::Revert() {
36 if (assigned_.get() != NULL) { 36 if (assigned_.get() != NULL) {
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 rtc::scoped_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