| Index: components/arc/arc_service_manager.cc
|
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
|
| index 4ef712209f85b98ce047c6ca595e99323cc16f54..0b5f48384e7d088564f20a3689a8f5867fbeb1e7 100644
|
| --- a/components/arc/arc_service_manager.cc
|
| +++ b/components/arc/arc_service_manager.cc
|
| @@ -22,7 +22,9 @@
|
| #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h"
|
| #include "components/arc/power/arc_power_bridge.h"
|
| #include "components/arc/storage_manager/arc_storage_manager.h"
|
| +#include "components/arc/user_data/arc_user_data_service.h"
|
| #include "components/arc/window_manager/arc_window_manager_bridge.h"
|
| +#include "components/prefs/pref_member.h"
|
| #include "ui/arc/notification/arc_notification_manager.h"
|
|
|
| namespace arc {
|
| @@ -65,6 +67,8 @@ ArcServiceManager::ArcServiceManager(
|
| AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
|
| AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service())));
|
| +
|
| + arc_user_data_service_ = base::MakeUnique<ArcUserDataService>(this);
|
| }
|
|
|
| ArcServiceManager::~ArcServiceManager() {
|
| @@ -95,13 +99,21 @@ void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
|
| }
|
|
|
| void ArcServiceManager::OnPrimaryUserProfilePrepared(
|
| - const AccountId& account_id) {
|
| + const AccountId& account_id,
|
| + std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| + arc_enabled_pref_ = std::move(arc_enabled_pref);
|
|
|
| + arc_user_data_service_->OnPrimaryUserProfilePrepared(account_id);
|
| AddService(base::WrapUnique(
|
| new ArcNotificationManager(arc_bridge_service(), account_id)));
|
| }
|
|
|
| +bool ArcServiceManager::IsArcEnabled() const {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + return arc_enabled_pref_ && arc_enabled_pref_->GetValue();
|
| +}
|
| +
|
| void ArcServiceManager::OnAshStarted() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| // We might come here multiple times. As such we should only do this once.
|
| @@ -116,6 +128,7 @@ void ArcServiceManager::OnAshStarted() {
|
| void ArcServiceManager::Shutdown() {
|
| icon_loader_ = nullptr;
|
| services_.clear();
|
| + arc_enabled_pref_ = nullptr;
|
| }
|
|
|
| //static
|
|
|