| Index: components/arc/arc_service_manager.cc
|
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
|
| index c29ecc26e9feb9197bd4ab9c2352c14729d85f8d..5710fe16e2bd0dc43657784f023569091bfde034 100644
|
| --- a/components/arc/arc_service_manager.cc
|
| +++ b/components/arc/arc_service_manager.cc
|
| @@ -19,7 +19,9 @@
|
| #include "components/arc/metrics/arc_metrics_service.h"
|
| #include "components/arc/net/arc_net_host_impl.h"
|
| #include "components/arc/power/arc_power_bridge.h"
|
| +#include "components/arc/userdata/arc_user_data_service.h"
|
| #include "components/arc/window_manager/arc_window_manager_bridge.h"
|
| +#include "components/prefs/pref_service.h"
|
| #include "ui/arc/notification/arc_notification_manager.h"
|
|
|
| namespace arc {
|
| @@ -58,6 +60,8 @@ ArcServiceManager::ArcServiceManager(
|
| AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
|
| +
|
| + arc_user_data_service_.reset(new ArcUserDataService());
|
| }
|
|
|
| ArcServiceManager::~ArcServiceManager() {
|
| @@ -88,9 +92,11 @@ void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
|
| }
|
|
|
| void ArcServiceManager::OnPrimaryUserProfilePrepared(
|
| - const AccountId& account_id) {
|
| + const AccountId& account_id,
|
| + PrefService* user_prefs) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| + arc_user_data_service_->ClearIfDisabled(user_prefs, account_id);
|
| AddService(base::WrapUnique(
|
| new ArcNotificationManager(arc_bridge_service(), account_id)));
|
| }
|
|
|