OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 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_BASE_TASKPARENT_H__ | 11 #ifndef WEBRTC_BASE_TASKPARENT_H__ |
12 #define WEBRTC_BASE_TASKPARENT_H__ | 12 #define WEBRTC_BASE_TASKPARENT_H__ |
13 | 13 |
| 14 #include <memory> |
14 #include <set> | 15 #include <set> |
15 | 16 |
16 #include "webrtc/base/basictypes.h" | 17 #include "webrtc/base/basictypes.h" |
17 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/constructormagic.h" |
18 | 19 |
19 namespace rtc { | 20 namespace rtc { |
20 | 21 |
21 class Task; | 22 class Task; |
22 class TaskRunner; | 23 class TaskRunner; |
23 | 24 |
24 class TaskParent { | 25 class TaskParent { |
25 public: | 26 public: |
26 TaskParent(Task *derived_instance, TaskParent *parent); | 27 TaskParent(Task *derived_instance, TaskParent *parent); |
27 explicit TaskParent(TaskRunner *derived_instance); | 28 explicit TaskParent(TaskRunner *derived_instance); |
(...skipping 17 matching lines...) Expand all Loading... |
45 | 46 |
46 private: | 47 private: |
47 void Initialize(); | 48 void Initialize(); |
48 void OnChildStopped(Task *child); | 49 void OnChildStopped(Task *child); |
49 void AddChild(Task *child); | 50 void AddChild(Task *child); |
50 | 51 |
51 TaskParent *parent_; | 52 TaskParent *parent_; |
52 TaskRunner *runner_; | 53 TaskRunner *runner_; |
53 bool child_error_; | 54 bool child_error_; |
54 typedef std::set<Task *> ChildSet; | 55 typedef std::set<Task *> ChildSet; |
55 scoped_ptr<ChildSet> children_; | 56 std::unique_ptr<ChildSet> children_; |
56 RTC_DISALLOW_COPY_AND_ASSIGN(TaskParent); | 57 RTC_DISALLOW_COPY_AND_ASSIGN(TaskParent); |
57 }; | 58 }; |
58 | 59 |
59 | 60 |
60 } // namespace rtc | 61 } // namespace rtc |
61 | 62 |
62 #endif // WEBRTC_BASE_TASKPARENT_H__ | 63 #endif // WEBRTC_BASE_TASKPARENT_H__ |
OLD | NEW |