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_UTILITY_UTILITY_THREAD_IMPL_H_ | 5 #ifndef CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |
6 #define CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ | 6 #define CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <string> | 9 #include <string> |
9 #include <vector> | 10 #include <vector> |
10 | 11 |
11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
15 #include "content/child/child_thread_impl.h" | 15 #include "content/child/child_thread_impl.h" |
16 #include "content/common/content_export.h" | 16 #include "content/common/content_export.h" |
17 #include "content/common/process_control.mojom.h" | 17 #include "content/common/process_control.mojom.h" |
18 #include "content/public/utility/utility_thread.h" | 18 #include "content/public/utility/utility_thread.h" |
19 #include "mojo/public/cpp/bindings/binding_set.h" | 19 #include "mojo/public/cpp/bindings/binding_set.h" |
20 | 20 |
21 namespace base { | 21 namespace base { |
22 class FilePath; | 22 class FilePath; |
23 } | 23 } |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 // IPC message handlers. | 55 // IPC message handlers. |
56 void OnBatchModeStarted(); | 56 void OnBatchModeStarted(); |
57 void OnBatchModeFinished(); | 57 void OnBatchModeFinished(); |
58 | 58 |
59 void BindProcessControlRequest( | 59 void BindProcessControlRequest( |
60 mojo::InterfaceRequest<content::mojom::ProcessControl> request); | 60 mojo::InterfaceRequest<content::mojom::ProcessControl> request); |
61 | 61 |
62 // True when we're running in batch mode. | 62 // True when we're running in batch mode. |
63 bool batch_mode_; | 63 bool batch_mode_; |
64 | 64 |
65 scoped_ptr<UtilityBlinkPlatformImpl> blink_platform_impl_; | 65 std::unique_ptr<UtilityBlinkPlatformImpl> blink_platform_impl_; |
66 | 66 |
67 // Process control for Mojo application hosting. | 67 // Process control for Mojo application hosting. |
68 scoped_ptr<UtilityProcessControlImpl> process_control_; | 68 std::unique_ptr<UtilityProcessControlImpl> process_control_; |
69 | 69 |
70 // Bindings to the mojom::ProcessControl impl. | 70 // Bindings to the mojom::ProcessControl impl. |
71 mojo::BindingSet<mojom::ProcessControl> process_control_bindings_; | 71 mojo::BindingSet<mojom::ProcessControl> process_control_bindings_; |
72 | 72 |
73 DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl); | 73 DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl); |
74 }; | 74 }; |
75 | 75 |
76 #if defined(COMPILER_MSVC) | 76 #if defined(COMPILER_MSVC) |
77 #pragma warning(pop) | 77 #pragma warning(pop) |
78 #endif | 78 #endif |
79 | 79 |
80 } // namespace content | 80 } // namespace content |
81 | 81 |
82 #endif // CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ | 82 #endif // CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |
OLD | NEW |