Chromium Code Reviews| 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/auth/arc_auth_service.h" | 11 #include "components/arc/auth/arc_auth_service.h" |
| 12 #include "components/arc/clipboard/arc_clipboard_bridge.h" | 12 #include "components/arc/clipboard/arc_clipboard_bridge.h" |
| 13 #include "components/arc/input/arc_input_bridge.h" | 13 #include "components/arc/input/arc_input_bridge.h" |
| 14 #include "components/arc/net/arc_net_host_impl.h" | |
| 14 #include "components/arc/power/arc_power_bridge.h" | 15 #include "components/arc/power/arc_power_bridge.h" |
| 15 #include "components/arc/settings/arc_settings_bridge.h" | 16 #include "components/arc/settings/arc_settings_bridge.h" |
| 16 | 17 |
| 17 namespace arc { | 18 namespace arc { |
| 18 | 19 |
| 19 namespace { | 20 namespace { |
| 20 | 21 |
| 21 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | 22 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
| 22 ArcServiceManager* g_arc_service_manager = nullptr; | 23 ArcServiceManager* g_arc_service_manager = nullptr; |
| 23 | 24 |
| 24 } // namespace | 25 } // namespace |
| 25 | 26 |
| 26 ArcServiceManager::ArcServiceManager( | 27 ArcServiceManager::ArcServiceManager( |
| 27 scoped_ptr<ArcAuthService> auth_service, | 28 scoped_ptr<ArcAuthService> auth_service, |
| 28 scoped_ptr<ArcSettingsBridge> settings_bridge) | 29 scoped_ptr<ArcSettingsBridge> settings_bridge) |
| 29 : arc_bridge_service_( | 30 : arc_bridge_service_( |
| 30 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), | 31 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), |
| 31 arc_auth_service_(std::move(auth_service)), | 32 arc_auth_service_(std::move(auth_service)), |
| 32 arc_clipboard_bridge_(new ArcClipboardBridge(arc_bridge_service_.get())), | 33 arc_clipboard_bridge_(new ArcClipboardBridge(arc_bridge_service_.get())), |
| 33 arc_input_bridge_(ArcInputBridge::Create(arc_bridge_service_.get())), | 34 arc_input_bridge_(ArcInputBridge::Create(arc_bridge_service_.get())), |
| 35 arc_net_host_(ArcNetHostImpl::CreateNetHost(arc_bridge_service_.get())), | |
|
Luis Héctor Chávez
2016/01/12 17:32:32
Since CreateNetHost is trivial, how about just new
cernekee
2016/01/12 20:14:47
Done.
| |
| 34 arc_settings_bridge_(std::move(settings_bridge)), | 36 arc_settings_bridge_(std::move(settings_bridge)), |
| 35 arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())) { | 37 arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())) { |
| 36 DCHECK(!g_arc_service_manager); | 38 DCHECK(!g_arc_service_manager); |
| 37 g_arc_service_manager = this; | 39 g_arc_service_manager = this; |
| 38 | 40 |
| 39 arc_settings_bridge_->StartObservingBridgeServiceChanges(); | 41 arc_settings_bridge_->StartObservingBridgeServiceChanges(); |
| 40 arc_auth_service_->StartObservingBridgeServiceChanges(); | 42 arc_auth_service_->StartObservingBridgeServiceChanges(); |
| 41 } | 43 } |
| 42 | 44 |
| 43 ArcServiceManager::~ArcServiceManager() { | 45 ArcServiceManager::~ArcServiceManager() { |
| 44 DCHECK(thread_checker_.CalledOnValidThread()); | 46 DCHECK(thread_checker_.CalledOnValidThread()); |
| 45 DCHECK(g_arc_service_manager == this); | 47 DCHECK(g_arc_service_manager == this); |
| 46 g_arc_service_manager = nullptr; | 48 g_arc_service_manager = nullptr; |
| 47 } | 49 } |
| 48 | 50 |
| 49 // static | 51 // static |
| 50 ArcServiceManager* ArcServiceManager::Get() { | 52 ArcServiceManager* ArcServiceManager::Get() { |
| 51 DCHECK(g_arc_service_manager); | 53 DCHECK(g_arc_service_manager); |
| 52 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); | 54 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); |
| 53 return g_arc_service_manager; | 55 return g_arc_service_manager; |
| 54 } | 56 } |
| 55 | 57 |
| 56 ArcBridgeService* ArcServiceManager::arc_bridge_service() { | 58 ArcBridgeService* ArcServiceManager::arc_bridge_service() { |
| 57 DCHECK(thread_checker_.CalledOnValidThread()); | 59 DCHECK(thread_checker_.CalledOnValidThread()); |
| 58 return arc_bridge_service_.get(); | 60 return arc_bridge_service_.get(); |
| 59 } | 61 } |
| 60 | 62 |
| 61 } // namespace arc | 63 } // namespace arc |
| OLD | NEW |