OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ | 5 #ifndef CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ |
6 #define CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ | 6 #define CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "content/browser/browser_thread_impl.h" | 12 #include "content/browser/browser_thread_impl.h" |
12 #include "content/common/content_export.h" | 13 #include "content/common/content_export.h" |
13 | 14 |
14 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
15 namespace base { | 16 namespace base { |
16 namespace win { | 17 namespace win { |
17 class ScopedCOMInitializer; | 18 class ScopedCOMInitializer; |
18 } | 19 } |
19 } | 20 } |
(...skipping 22 matching lines...) Expand all Loading... |
42 protected: | 43 protected: |
43 void Init() override; | 44 void Init() override; |
44 void CleanUp() override; | 45 void CleanUp() override; |
45 | 46 |
46 private: | 47 private: |
47 // These methods encapsulate cleanup that needs to happen on the IO thread | 48 // These methods encapsulate cleanup that needs to happen on the IO thread |
48 // before we call the embedder's CleanUp function. | 49 // before we call the embedder's CleanUp function. |
49 void IOThreadPreCleanUp(); | 50 void IOThreadPreCleanUp(); |
50 | 51 |
51 #if defined (OS_WIN) | 52 #if defined (OS_WIN) |
52 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; | 53 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_; |
53 #endif | 54 #endif |
54 | 55 |
55 // Each specialized thread has its own notification service. | 56 // Each specialized thread has its own notification service. |
56 scoped_ptr<NotificationService> notification_service_; | 57 std::unique_ptr<NotificationService> notification_service_; |
57 | 58 |
58 DISALLOW_COPY_AND_ASSIGN(BrowserProcessSubThread); | 59 DISALLOW_COPY_AND_ASSIGN(BrowserProcessSubThread); |
59 }; | 60 }; |
60 | 61 |
61 } // namespace content | 62 } // namespace content |
62 | 63 |
63 #endif // CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ | 64 #endif // CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ |
OLD | NEW |