Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Side by Side Diff: components/arc/arc_service_manager.cc

Issue 2001013004: Revert of Add OBB mounter Mojo interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/arc/arc_bridge_service.cc ('k') | components/arc/common/arc_bridge.mojom » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/obb_mounter/arc_obb_mounter_bridge.h"
22 #include "components/arc/power/arc_power_bridge.h" 21 #include "components/arc/power/arc_power_bridge.h"
23 #include "components/arc/storage_manager/arc_storage_manager.h" 22 #include "components/arc/storage_manager/arc_storage_manager.h"
24 #include "components/arc/window_manager/arc_window_manager_bridge.h" 23 #include "components/arc/window_manager/arc_window_manager_bridge.h"
25 #include "ui/arc/notification/arc_notification_manager.h" 24 #include "ui/arc/notification/arc_notification_manager.h"
26 25
27 namespace arc { 26 namespace arc {
28 27
29 namespace { 28 namespace {
30 29
31 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. 30 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos.
(...skipping 20 matching lines...) Expand all
52 51
53 AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service()))); 52 AddService(base::WrapUnique(new ArcAudioBridge(arc_bridge_service())));
54 AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service()))); 53 AddService(base::WrapUnique(new ArcBluetoothBridge(arc_bridge_service())));
55 AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service()))); 54 AddService(base::WrapUnique(new ArcClipboardBridge(arc_bridge_service())));
56 AddService( 55 AddService(
57 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service()))); 56 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));
58 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service()))); 57 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));
59 AddService(base::WrapUnique(new ArcIntentHelperBridge(arc_bridge_service()))); 58 AddService(base::WrapUnique(new ArcIntentHelperBridge(arc_bridge_service())));
60 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service()))); 59 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
61 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service()))); 60 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
62 AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
63 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service()))); 61 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
64 AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service()))); 62 AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service())));
65 } 63 }
66 64
67 ArcServiceManager::~ArcServiceManager() { 65 ArcServiceManager::~ArcServiceManager() {
68 DCHECK(thread_checker_.CalledOnValidThread()); 66 DCHECK(thread_checker_.CalledOnValidThread());
69 DCHECK(g_arc_service_manager == this); 67 DCHECK(g_arc_service_manager == this);
70 g_arc_service_manager = nullptr; 68 g_arc_service_manager = nullptr;
71 if (g_arc_bridge_service_for_testing) { 69 if (g_arc_bridge_service_for_testing) {
72 delete g_arc_bridge_service_for_testing; 70 delete g_arc_bridge_service_for_testing;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 //static 115 //static
118 void ArcServiceManager::SetArcBridgeServiceForTesting( 116 void ArcServiceManager::SetArcBridgeServiceForTesting(
119 std::unique_ptr<ArcBridgeService> arc_bridge_service) { 117 std::unique_ptr<ArcBridgeService> arc_bridge_service) {
120 if (g_arc_bridge_service_for_testing) { 118 if (g_arc_bridge_service_for_testing) {
121 delete g_arc_bridge_service_for_testing; 119 delete g_arc_bridge_service_for_testing;
122 } 120 }
123 g_arc_bridge_service_for_testing = arc_bridge_service.release(); 121 g_arc_bridge_service_for_testing = arc_bridge_service.release();
124 } 122 }
125 123
126 } // namespace arc 124 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_service.cc ('k') | components/arc/common/arc_bridge.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698