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

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

Issue 1966133002: Run RemoveArcData after a user has opted out (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 6 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
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/activity_icon_loader.h" 18 #include "components/arc/intent_helper/activity_icon_loader.h"
19 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 19 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
20 #include "components/arc/metrics/arc_metrics_service.h" 20 #include "components/arc/metrics/arc_metrics_service.h"
21 #include "components/arc/net/arc_net_host_impl.h" 21 #include "components/arc/net/arc_net_host_impl.h"
22 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h" 22 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h"
23 #include "components/arc/power/arc_power_bridge.h" 23 #include "components/arc/power/arc_power_bridge.h"
24 #include "components/arc/storage_manager/arc_storage_manager.h" 24 #include "components/arc/storage_manager/arc_storage_manager.h"
25 #include "components/arc/user_data/arc_user_data_service.h"
25 #include "components/arc/window_manager/arc_window_manager_bridge.h" 26 #include "components/arc/window_manager/arc_window_manager_bridge.h"
27 #include "components/prefs/pref_member.h"
26 #include "ui/arc/notification/arc_notification_manager.h" 28 #include "ui/arc/notification/arc_notification_manager.h"
27 29
28 namespace arc { 30 namespace arc {
29 31
30 namespace { 32 namespace {
31 33
32 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. 34 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos.
33 ArcServiceManager* g_arc_service_manager = nullptr; 35 ArcServiceManager* g_arc_service_manager = nullptr;
34 36
35 // This pointer is owned by ArcServiceManager. 37 // This pointer is owned by ArcServiceManager.
(...skipping 22 matching lines...) Expand all
58 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service()))); 60 base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));
59 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service()))); 61 AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));
60 icon_loader_ = new ActivityIconLoader; 62 icon_loader_ = new ActivityIconLoader;
61 AddService(base::WrapUnique( 63 AddService(base::WrapUnique(
62 new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_))); 64 new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_)));
63 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service()))); 65 AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
64 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service()))); 66 AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
65 AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service()))); 67 AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
66 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service()))); 68 AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
67 AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service()))); 69 AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service())));
70
hidehiko 2016/06/14 05:13:01 nit: unnecessary.
dspaid 2016/06/14 05:40:54 Done.
68 } 71 }
69 72
70 ArcServiceManager::~ArcServiceManager() { 73 ArcServiceManager::~ArcServiceManager() {
71 DCHECK(thread_checker_.CalledOnValidThread()); 74 DCHECK(thread_checker_.CalledOnValidThread());
72 DCHECK(g_arc_service_manager == this); 75 DCHECK(g_arc_service_manager == this);
73 g_arc_service_manager = nullptr; 76 g_arc_service_manager = nullptr;
74 if (g_arc_bridge_service_for_testing) { 77 if (g_arc_bridge_service_for_testing) {
75 delete g_arc_bridge_service_for_testing; 78 delete g_arc_bridge_service_for_testing;
76 } 79 }
77 } 80 }
(...skipping 10 matching lines...) Expand all
88 return arc_bridge_service_.get(); 91 return arc_bridge_service_.get();
89 } 92 }
90 93
91 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) { 94 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
92 DCHECK(thread_checker_.CalledOnValidThread()); 95 DCHECK(thread_checker_.CalledOnValidThread());
93 96
94 services_.emplace_back(std::move(service)); 97 services_.emplace_back(std::move(service));
95 } 98 }
96 99
97 void ArcServiceManager::OnPrimaryUserProfilePrepared( 100 void ArcServiceManager::OnPrimaryUserProfilePrepared(
98 const AccountId& account_id) { 101 const AccountId& account_id,
102 std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
99 DCHECK(thread_checker_.CalledOnValidThread()); 103 DCHECK(thread_checker_.CalledOnValidThread());
100 104
105 ArcUserDataService* arc_user_data_service = new ArcUserDataService(
106 arc_bridge_service(), std::move(arc_enabled_pref));
107 AddService(base::WrapUnique(arc_user_data_service));
108 arc_user_data_service->OnPrimaryUserProfilePrepared(account_id);
109
101 AddService(base::WrapUnique( 110 AddService(base::WrapUnique(
102 new ArcNotificationManager(arc_bridge_service(), account_id))); 111 new ArcNotificationManager(arc_bridge_service(), account_id)));
103 } 112 }
104 113
105 void ArcServiceManager::OnAshStarted() { 114 void ArcServiceManager::OnAshStarted() {
106 DCHECK(thread_checker_.CalledOnValidThread()); 115 DCHECK(thread_checker_.CalledOnValidThread());
107 // We might come here multiple times. As such we should only do this once. 116 // We might come here multiple times. As such we should only do this once.
108 if (on_ash_started_called_) 117 if (on_ash_started_called_)
109 return; 118 return;
110 119
(...skipping 10 matching lines...) Expand all
121 //static 130 //static
122 void ArcServiceManager::SetArcBridgeServiceForTesting( 131 void ArcServiceManager::SetArcBridgeServiceForTesting(
123 std::unique_ptr<ArcBridgeService> arc_bridge_service) { 132 std::unique_ptr<ArcBridgeService> arc_bridge_service) {
124 if (g_arc_bridge_service_for_testing) { 133 if (g_arc_bridge_service_for_testing) {
125 delete g_arc_bridge_service_for_testing; 134 delete g_arc_bridge_service_for_testing;
126 } 135 }
127 g_arc_bridge_service_for_testing = arc_bridge_service.release(); 136 g_arc_bridge_service_for_testing = arc_bridge_service.release();
128 } 137 }
129 138
130 } // namespace arc 139 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698