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/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/sequenced_task_runner.h" | 8 #include "base/sequenced_task_runner.h" |
9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
10 #include "components/arc/arc_bridge_bootstrap.h" | 10 #include "components/arc/arc_bridge_bootstrap.h" |
11 #include "components/arc/arc_bridge_service.h" | 11 #include "components/arc/arc_bridge_service.h" |
12 #include "components/arc/arc_bridge_service_impl.h" | 12 #include "components/arc/arc_bridge_service_impl.h" |
13 #include "components/arc/audio/arc_audio_bridge.h" | 13 #include "components/arc/audio/arc_audio_bridge.h" |
14 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" | 14 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" |
15 #include "components/arc/clipboard/arc_clipboard_bridge.h" | 15 #include "components/arc/clipboard/arc_clipboard_bridge.h" |
16 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" | 16 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" |
17 #include "components/arc/ime/arc_ime_service.h" | 17 #include "components/arc/ime/arc_ime_service.h" |
18 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" | 18 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" |
19 #include "components/arc/metrics/arc_metrics_service.h" | 19 #include "components/arc/metrics/arc_metrics_service.h" |
20 #include "components/arc/net/arc_net_host_impl.h" | 20 #include "components/arc/net/arc_net_host_impl.h" |
21 #include "components/arc/power/arc_power_bridge.h" | 21 #include "components/arc/power/arc_power_bridge.h" |
| 22 #include "components/arc/userdata/arc_user_data_service.h" |
22 #include "components/arc/window_manager/arc_window_manager_bridge.h" | 23 #include "components/arc/window_manager/arc_window_manager_bridge.h" |
23 #include "ui/arc/notification/arc_notification_manager.h" | 24 #include "ui/arc/notification/arc_notification_manager.h" |
24 | 25 |
25 namespace arc { | 26 namespace arc { |
26 | 27 |
27 namespace { | 28 namespace { |
28 | 29 |
29 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | 30 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
30 ArcServiceManager* g_arc_service_manager = nullptr; | 31 ArcServiceManager* g_arc_service_manager = nullptr; |
31 | 32 |
(...skipping 19 matching lines...) Expand all Loading... |
51 AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service()))); | 52 AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service()))); |
52 AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service()))); | 53 AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service()))); |
53 AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service()))); | 54 AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service()))); |
54 AddService( | 55 AddService( |
55 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service()))); | 56 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service()))); |
56 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service()))); | 57 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service()))); |
57 AddService(base::WrapUnique(new ArcIntentHelperBridge(arc_bridge_service()))); | 58 AddService(base::WrapUnique(new ArcIntentHelperBridge(arc_bridge_service()))); |
58 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service()))); | 59 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service()))); |
59 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service()))); | 60 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service()))); |
60 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service()))); | 61 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service()))); |
| 62 |
| 63 arc_user_data_service_.reset(new ArcUserDataService()); |
61 } | 64 } |
62 | 65 |
63 ArcServiceManager::~ArcServiceManager() { | 66 ArcServiceManager::~ArcServiceManager() { |
64 DCHECK(thread_checker_.CalledOnValidThread()); | 67 DCHECK(thread_checker_.CalledOnValidThread()); |
65 DCHECK(g_arc_service_manager == this); | 68 DCHECK(g_arc_service_manager == this); |
66 g_arc_service_manager = nullptr; | 69 g_arc_service_manager = nullptr; |
67 if (g_arc_bridge_service_for_testing) { | 70 if (g_arc_bridge_service_for_testing) { |
68 delete g_arc_bridge_service_for_testing; | 71 delete g_arc_bridge_service_for_testing; |
69 } | 72 } |
70 } | 73 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 //static | 116 //static |
114 void ArcServiceManager::SetArcBridgeServiceForTesting( | 117 void ArcServiceManager::SetArcBridgeServiceForTesting( |
115 std::unique_ptr<ArcBridgeService> arc_bridge_service) { | 118 std::unique_ptr<ArcBridgeService> arc_bridge_service) { |
116 if (g_arc_bridge_service_for_testing) { | 119 if (g_arc_bridge_service_for_testing) { |
117 delete g_arc_bridge_service_for_testing; | 120 delete g_arc_bridge_service_for_testing; |
118 } | 121 } |
119 g_arc_bridge_service_for_testing = arc_bridge_service.release(); | 122 g_arc_bridge_service_for_testing = arc_bridge_service.release(); |
120 } | 123 } |
121 | 124 |
122 } // namespace arc | 125 } // namespace arc |
OLD | NEW |