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/arc_video_service.h" |
11 #include "components/arc/input/arc_input_bridge.h" | 12 #include "components/arc/input/arc_input_bridge.h" |
12 #include "components/arc/settings/arc_settings_bridge.h" | 13 #include "components/arc/settings/arc_settings_bridge.h" |
13 | 14 |
14 namespace arc { | 15 namespace arc { |
15 | 16 |
16 namespace { | 17 namespace { |
17 | 18 |
18 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | 19 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
19 ArcServiceManager* g_arc_service_manager = nullptr; | 20 ArcServiceManager* g_arc_service_manager = nullptr; |
20 | 21 |
21 } // namespace | 22 } // namespace |
22 | 23 |
23 ArcServiceManager::ArcServiceManager( | 24 ArcServiceManager::ArcServiceManager( |
24 scoped_ptr<ArcSettingsBridge> settings_bridge) | 25 scoped_ptr<ArcSettingsBridge> settings_bridge, |
| 26 scoped_ptr<ArcVideoService> arc_video_service) |
25 : arc_bridge_service_( | 27 : arc_bridge_service_( |
26 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), | 28 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), |
27 arc_settings_bridge_(std::move(settings_bridge)) { | 29 arc_settings_bridge_(std::move(settings_bridge)), |
| 30 arc_video_service_(std::move(arc_video_service)) { |
28 DCHECK(!g_arc_service_manager); | 31 DCHECK(!g_arc_service_manager); |
29 arc_input_bridge_ = ArcInputBridge::Create(arc_bridge_service_.get()); | 32 arc_input_bridge_ = ArcInputBridge::Create(arc_bridge_service_.get()); |
30 g_arc_service_manager = this; | 33 g_arc_service_manager = this; |
31 | 34 |
32 arc_settings_bridge_->StartObservingBridgeServiceChanges(); | 35 arc_settings_bridge_->StartObservingBridgeServiceChanges(); |
| 36 arc_video_service_->Initialize(); |
33 } | 37 } |
34 | 38 |
35 ArcServiceManager::~ArcServiceManager() { | 39 ArcServiceManager::~ArcServiceManager() { |
36 DCHECK(thread_checker_.CalledOnValidThread()); | 40 DCHECK(thread_checker_.CalledOnValidThread()); |
37 DCHECK(g_arc_service_manager == this); | 41 DCHECK(g_arc_service_manager == this); |
38 g_arc_service_manager = nullptr; | 42 g_arc_service_manager = nullptr; |
39 } | 43 } |
40 | 44 |
41 // static | 45 // static |
42 ArcServiceManager* ArcServiceManager::Get() { | 46 ArcServiceManager* ArcServiceManager::Get() { |
43 DCHECK(g_arc_service_manager); | 47 DCHECK(g_arc_service_manager); |
44 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); | 48 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); |
45 return g_arc_service_manager; | 49 return g_arc_service_manager; |
46 } | 50 } |
47 | 51 |
48 ArcBridgeService* ArcServiceManager::arc_bridge_service() { | 52 ArcBridgeService* ArcServiceManager::arc_bridge_service() { |
49 DCHECK(thread_checker_.CalledOnValidThread()); | 53 DCHECK(thread_checker_.CalledOnValidThread()); |
50 return arc_bridge_service_.get(); | 54 return arc_bridge_service_.get(); |
51 } | 55 } |
52 | 56 |
53 } // namespace arc | 57 } // namespace arc |
OLD | NEW |