OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "components/arc/arc_service_manager.h" | 5 #include "components/arc/arc_service_manager.h" |
6 | 6 |
7 #include "base/sequenced_task_runner.h" | 7 #include "base/sequenced_task_runner.h" |
8 #include "base/thread_task_runner_handle.h" | 8 #include "base/thread_task_runner_handle.h" |
9 #include "components/arc/arc_bridge_bootstrap.h" | 9 #include "components/arc/arc_bridge_bootstrap.h" |
10 #include "components/arc/arc_bridge_service_impl.h" | 10 #include "components/arc/arc_bridge_service_impl.h" |
| 11 #include "components/arc/input/arc_input_bridge.h" |
11 | 12 |
12 namespace arc { | 13 namespace arc { |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | 17 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
17 ArcServiceManager* g_arc_service_manager = nullptr; | 18 ArcServiceManager* g_arc_service_manager = nullptr; |
18 | 19 |
19 } // namespace | 20 } // namespace |
20 | 21 |
21 ArcServiceManager::ArcServiceManager() | 22 ArcServiceManager::ArcServiceManager() |
22 : arc_bridge_service_( | 23 : arc_bridge_service_( |
23 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())) { | 24 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())) { |
24 DCHECK(!g_arc_service_manager); | 25 DCHECK(!g_arc_service_manager); |
| 26 arc_input_bridge_ = ArcInputBridge::Create(arc_bridge_service_.get()); |
25 g_arc_service_manager = this; | 27 g_arc_service_manager = this; |
26 } | 28 } |
27 | 29 |
28 ArcServiceManager::~ArcServiceManager() { | 30 ArcServiceManager::~ArcServiceManager() { |
29 DCHECK(thread_checker_.CalledOnValidThread()); | 31 DCHECK(thread_checker_.CalledOnValidThread()); |
30 DCHECK(g_arc_service_manager == this); | 32 DCHECK(g_arc_service_manager == this); |
31 g_arc_service_manager = nullptr; | 33 g_arc_service_manager = nullptr; |
32 } | 34 } |
33 | 35 |
34 // static | 36 // static |
35 ArcServiceManager* ArcServiceManager::Get() { | 37 ArcServiceManager* ArcServiceManager::Get() { |
36 DCHECK(g_arc_service_manager); | 38 DCHECK(g_arc_service_manager); |
37 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); | 39 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); |
38 return g_arc_service_manager; | 40 return g_arc_service_manager; |
39 } | 41 } |
40 | 42 |
41 ArcBridgeService* ArcServiceManager::arc_bridge_service() { | 43 ArcBridgeService* ArcServiceManager::arc_bridge_service() { |
42 DCHECK(thread_checker_.CalledOnValidThread()); | 44 DCHECK(thread_checker_.CalledOnValidThread()); |
43 return arc_bridge_service_.get(); | 45 return arc_bridge_service_.get(); |
44 } | 46 } |
45 | 47 |
46 } // namespace arc | 48 } // namespace arc |
OLD | NEW |