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

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

Issue 1829703002: Add ArcEnabled policy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments. Created 4 years, 8 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_service_manager.h ('k') | components/arc/test/fake_arc_bridge_bootstrap.h » ('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/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.h"
10 #include "components/arc/arc_bridge_service_impl.h" 11 #include "components/arc/arc_bridge_service_impl.h"
11 #include "components/arc/audio/arc_audio_bridge.h" 12 #include "components/arc/audio/arc_audio_bridge.h"
12 #include "components/arc/clipboard/arc_clipboard_bridge.h" 13 #include "components/arc/clipboard/arc_clipboard_bridge.h"
13 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" 14 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
14 #include "components/arc/ime/arc_ime_service.h" 15 #include "components/arc/ime/arc_ime_service.h"
15 #include "components/arc/input/arc_input_bridge.h" 16 #include "components/arc/input/arc_input_bridge.h"
16 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 17 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
17 #include "components/arc/metrics/arc_metrics_service.h" 18 #include "components/arc/metrics/arc_metrics_service.h"
18 #include "components/arc/net/arc_net_host_impl.h" 19 #include "components/arc/net/arc_net_host_impl.h"
19 #include "components/arc/power/arc_power_bridge.h" 20 #include "components/arc/power/arc_power_bridge.h"
20 #include "ui/arc/notification/arc_notification_manager.h" 21 #include "ui/arc/notification/arc_notification_manager.h"
21 22
22 namespace arc { 23 namespace arc {
23 24
24 namespace { 25 namespace {
25 26
26 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. 27 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos.
27 ArcServiceManager* g_arc_service_manager = nullptr; 28 ArcServiceManager* g_arc_service_manager = nullptr;
28 29
30 // This pointer is owned by ArcServiceManager.
31 ArcBridgeService* g_arc_bridge_service_for_testing = nullptr;
32
29 } // namespace 33 } // namespace
30 34
31 ArcServiceManager::ArcServiceManager() 35 ArcServiceManager::ArcServiceManager() {
32 : arc_bridge_service_(
33 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())) {
34 DCHECK(!g_arc_service_manager); 36 DCHECK(!g_arc_service_manager);
35 g_arc_service_manager = this; 37 g_arc_service_manager = this;
36 38
39 if (g_arc_bridge_service_for_testing) {
40 arc_bridge_service_.reset(g_arc_bridge_service_for_testing);
41 g_arc_bridge_service_for_testing = nullptr;
42 } else {
43 arc_bridge_service_.reset(new ArcBridgeServiceImpl(
44 ArcBridgeBootstrap::Create()));
45 }
46
37 AddService(make_scoped_ptr(new ArcAudioBridge(arc_bridge_service()))); 47 AddService(make_scoped_ptr(new ArcAudioBridge(arc_bridge_service())));
38 AddService(make_scoped_ptr(new ArcClipboardBridge(arc_bridge_service()))); 48 AddService(make_scoped_ptr(new ArcClipboardBridge(arc_bridge_service())));
39 AddService( 49 AddService(
40 make_scoped_ptr(new ArcCrashCollectorBridge(arc_bridge_service()))); 50 make_scoped_ptr(new ArcCrashCollectorBridge(arc_bridge_service())));
41 AddService(make_scoped_ptr(new ArcImeService(arc_bridge_service()))); 51 AddService(make_scoped_ptr(new ArcImeService(arc_bridge_service())));
42 AddService(make_scoped_ptr(new ArcInputBridge(arc_bridge_service()))); 52 AddService(make_scoped_ptr(new ArcInputBridge(arc_bridge_service())));
43 AddService(make_scoped_ptr(new ArcIntentHelperBridge(arc_bridge_service()))); 53 AddService(make_scoped_ptr(new ArcIntentHelperBridge(arc_bridge_service())));
44 AddService(make_scoped_ptr(new ArcMetricsService(arc_bridge_service()))); 54 AddService(make_scoped_ptr(new ArcMetricsService(arc_bridge_service())));
45 AddService(make_scoped_ptr(new ArcNetHostImpl(arc_bridge_service()))); 55 AddService(make_scoped_ptr(new ArcNetHostImpl(arc_bridge_service())));
46 AddService(make_scoped_ptr(new ArcPowerBridge(arc_bridge_service()))); 56 AddService(make_scoped_ptr(new ArcPowerBridge(arc_bridge_service())));
47 } 57 }
48 58
49 ArcServiceManager::~ArcServiceManager() { 59 ArcServiceManager::~ArcServiceManager() {
50 DCHECK(thread_checker_.CalledOnValidThread()); 60 DCHECK(thread_checker_.CalledOnValidThread());
51 DCHECK(g_arc_service_manager == this); 61 DCHECK(g_arc_service_manager == this);
52 g_arc_service_manager = nullptr; 62 g_arc_service_manager = nullptr;
63 if (g_arc_bridge_service_for_testing) {
64 delete g_arc_bridge_service_for_testing;
65 }
53 } 66 }
54 67
55 // static 68 // static
56 ArcServiceManager* ArcServiceManager::Get() { 69 ArcServiceManager* ArcServiceManager::Get() {
57 DCHECK(g_arc_service_manager); 70 DCHECK(g_arc_service_manager);
58 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); 71 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread());
59 return g_arc_service_manager; 72 return g_arc_service_manager;
60 } 73 }
61 74
62 ArcBridgeService* ArcServiceManager::arc_bridge_service() { 75 ArcBridgeService* ArcServiceManager::arc_bridge_service() {
63 DCHECK(thread_checker_.CalledOnValidThread()); 76 DCHECK(thread_checker_.CalledOnValidThread());
64 return arc_bridge_service_.get(); 77 return arc_bridge_service_.get();
65 } 78 }
66 79
67 void ArcServiceManager::AddService(scoped_ptr<ArcService> service) { 80 void ArcServiceManager::AddService(scoped_ptr<ArcService> service) {
68 DCHECK(thread_checker_.CalledOnValidThread()); 81 DCHECK(thread_checker_.CalledOnValidThread());
69 82
70 services_.emplace_back(std::move(service)); 83 services_.emplace_back(std::move(service));
71 } 84 }
72 85
73 void ArcServiceManager::OnPrimaryUserProfilePrepared( 86 void ArcServiceManager::OnPrimaryUserProfilePrepared(
74 const AccountId& account_id) { 87 const AccountId& account_id) {
75 DCHECK(thread_checker_.CalledOnValidThread()); 88 DCHECK(thread_checker_.CalledOnValidThread());
76 89
77 AddService(make_scoped_ptr( 90 AddService(make_scoped_ptr(
78 new ArcNotificationManager(arc_bridge_service(), account_id))); 91 new ArcNotificationManager(arc_bridge_service(), account_id)));
79 } 92 }
80 93
94 //static
95 void ArcServiceManager::SetArcBridgeServiceForTesting(
96 scoped_ptr<ArcBridgeService> arc_bridge_service) {
97 if (g_arc_bridge_service_for_testing) {
98 delete g_arc_bridge_service_for_testing;
99 }
100 g_arc_bridge_service_for_testing = arc_bridge_service.release();
101 }
102
81 } // namespace arc 103 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_service_manager.h ('k') | components/arc/test/fake_arc_bridge_bootstrap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698