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

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

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
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_
13 13
14 #include <memory>
15
14 #include <windows.h> 16 #include <windows.h>
15 17
16 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 class Desktop; 22 class Desktop;
22 23
23 class ScopedThreadDesktop { 24 class ScopedThreadDesktop {
24 public: 25 public:
25 ScopedThreadDesktop(); 26 ScopedThreadDesktop();
26 ~ScopedThreadDesktop(); 27 ~ScopedThreadDesktop();
27 28
28 // Returns true if |desktop| has the same desktop name as the currently 29 // Returns true if |desktop| has the same desktop name as the currently
29 // assigned desktop (if assigned) or as the initial desktop (if not assigned). 30 // assigned desktop (if assigned) or as the initial desktop (if not assigned).
30 // Returns false in any other case including failing Win32 APIs and 31 // Returns false in any other case including failing Win32 APIs and
31 // uninitialized desktop handles. 32 // uninitialized desktop handles.
32 bool IsSame(const Desktop& desktop); 33 bool IsSame(const Desktop& desktop);
33 34
34 // Reverts the calling thread to use the initial desktop. 35 // Reverts the calling thread to use the initial desktop.
35 void Revert(); 36 void Revert();
36 37
37 // Assigns |desktop| to be the calling thread. Returns true if the thread has 38 // Assigns |desktop| to be the calling thread. Returns true if the thread has
38 // been switched to |desktop| successfully. Takes ownership of |desktop|. 39 // been switched to |desktop| successfully. Takes ownership of |desktop|.
39 bool SetThreadDesktop(Desktop* desktop); 40 bool SetThreadDesktop(Desktop* desktop);
40 41
41 private: 42 private:
42 // The desktop handle assigned to the calling thread by Set 43 // The desktop handle assigned to the calling thread by Set
43 rtc::scoped_ptr<Desktop> assigned_; 44 std::unique_ptr<Desktop> assigned_;
44 45
45 // The desktop handle assigned to the calling thread at creation. 46 // The desktop handle assigned to the calling thread at creation.
46 rtc::scoped_ptr<Desktop> initial_; 47 std::unique_ptr<Desktop> initial_;
47 48
48 RTC_DISALLOW_COPY_AND_ASSIGN(ScopedThreadDesktop); 49 RTC_DISALLOW_COPY_AND_ASSIGN(ScopedThreadDesktop);
49 }; 50 };
50 51
51 } // namespace webrtc 52 } // namespace webrtc
52 53
53 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ 54 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698