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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/sequenced_task_runner.h" | 10 #include "base/sequenced_task_runner.h" |
11 #include "base/threading/thread_task_runner_handle.h" | 11 #include "base/threading/thread_task_runner_handle.h" |
12 #include "components/arc/arc_bridge_service.h" | 12 #include "components/arc/arc_bridge_service.h" |
13 #include "components/arc/arc_bridge_service_impl.h" | 13 #include "components/arc/arc_bridge_service_impl.h" |
14 #include "components/arc/audio/arc_audio_bridge.h" | 14 #include "components/arc/audio/arc_audio_bridge.h" |
15 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" | 15 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" |
16 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h" | 16 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h" |
17 #include "components/arc/clipboard/arc_clipboard_bridge.h" | 17 #include "components/arc/clipboard/arc_clipboard_bridge.h" |
18 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" | 18 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" |
19 #include "components/arc/ime/arc_ime_service.h" | 19 #include "components/arc/ime/arc_ime_service.h" |
20 #include "components/arc/intent_helper/activity_icon_loader.h" | 20 #include "components/arc/intent_helper/activity_icon_loader.h" |
21 #include "components/arc/metrics/arc_metrics_service.h" | 21 #include "components/arc/metrics/arc_metrics_service.h" |
22 #include "components/arc/net/arc_net_host_impl.h" | 22 #include "components/arc/net/arc_net_host_impl.h" |
23 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h" | 23 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h" |
24 #include "components/arc/power/arc_power_bridge.h" | 24 #include "components/arc/power/arc_power_bridge.h" |
25 #include "components/arc/storage_manager/arc_storage_manager.h" | 25 #include "components/arc/storage_manager/arc_storage_manager.h" |
| 26 #include "components/arc/trace/arc_trace_bridge.h" |
26 #include "components/arc/user_data/arc_user_data_service.h" | 27 #include "components/arc/user_data/arc_user_data_service.h" |
27 #include "components/prefs/pref_member.h" | 28 #include "components/prefs/pref_member.h" |
28 #include "ui/arc/notification/arc_notification_manager.h" | 29 #include "ui/arc/notification/arc_notification_manager.h" |
29 | 30 |
30 namespace arc { | 31 namespace arc { |
31 | 32 |
32 namespace { | 33 namespace { |
33 | 34 |
34 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | 35 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
35 ArcServiceManager* g_arc_service_manager = nullptr; | 36 ArcServiceManager* g_arc_service_manager = nullptr; |
(...skipping 23 matching lines...) Expand all Loading... |
59 AddService(base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service())); | 60 AddService(base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service())); |
60 AddService(base::MakeUnique<ArcClipboardBridge>(arc_bridge_service())); | 61 AddService(base::MakeUnique<ArcClipboardBridge>(arc_bridge_service())); |
61 AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service(), | 62 AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service(), |
62 blocking_task_runner_)); | 63 blocking_task_runner_)); |
63 AddService(base::MakeUnique<ArcImeService>(arc_bridge_service())); | 64 AddService(base::MakeUnique<ArcImeService>(arc_bridge_service())); |
64 AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service())); | 65 AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service())); |
65 AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service())); | 66 AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service())); |
66 AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service())); | 67 AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service())); |
67 AddService(base::MakeUnique<ArcPowerBridge>(arc_bridge_service())); | 68 AddService(base::MakeUnique<ArcPowerBridge>(arc_bridge_service())); |
68 AddService(base::MakeUnique<ArcStorageManager>(arc_bridge_service())); | 69 AddService(base::MakeUnique<ArcStorageManager>(arc_bridge_service())); |
| 70 AddService(base::MakeUnique<ArcTraceBridge>(arc_bridge_service())); |
69 } | 71 } |
70 | 72 |
71 ArcServiceManager::~ArcServiceManager() { | 73 ArcServiceManager::~ArcServiceManager() { |
72 DCHECK(thread_checker_.CalledOnValidThread()); | 74 DCHECK(thread_checker_.CalledOnValidThread()); |
73 DCHECK(g_arc_service_manager == this); | 75 DCHECK(g_arc_service_manager == this); |
74 g_arc_service_manager = nullptr; | 76 g_arc_service_manager = nullptr; |
75 if (g_arc_bridge_service_for_testing) { | 77 if (g_arc_bridge_service_for_testing) { |
76 delete g_arc_bridge_service_for_testing; | 78 delete g_arc_bridge_service_for_testing; |
77 } | 79 } |
78 } | 80 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 // static | 114 // static |
113 void ArcServiceManager::SetArcBridgeServiceForTesting( | 115 void ArcServiceManager::SetArcBridgeServiceForTesting( |
114 std::unique_ptr<ArcBridgeService> arc_bridge_service) { | 116 std::unique_ptr<ArcBridgeService> arc_bridge_service) { |
115 if (g_arc_bridge_service_for_testing) { | 117 if (g_arc_bridge_service_for_testing) { |
116 delete g_arc_bridge_service_for_testing; | 118 delete g_arc_bridge_service_for_testing; |
117 } | 119 } |
118 g_arc_bridge_service_for_testing = arc_bridge_service.release(); | 120 g_arc_bridge_service_for_testing = arc_bridge_service.release(); |
119 } | 121 } |
120 | 122 |
121 } // namespace arc | 123 } // namespace arc |
OLD | NEW |