Commit d637f9a5 authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS PhoneHub] Add FindMyDeviceController to PhoneHubManager

This was missed when originally creating the class.

Bug: 1106937
Change-Id: Iad47abb34673a5556518f03fe82ed4c04f74d729
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391650
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: default avatarRegan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804054}
parent 8e93a8e0
...@@ -19,6 +19,10 @@ FeatureStatusProvider* FakePhoneHubManager::GetFeatureStatusProvider() { ...@@ -19,6 +19,10 @@ FeatureStatusProvider* FakePhoneHubManager::GetFeatureStatusProvider() {
return &fake_feature_status_provider_; return &fake_feature_status_provider_;
} }
FindMyDeviceController* FakePhoneHubManager::GetFindMyDeviceController() {
return &fake_find_my_device_controller_;
}
NotificationAccessManager* FakePhoneHubManager::GetNotificationAccessManager() { NotificationAccessManager* FakePhoneHubManager::GetNotificationAccessManager() {
return &fake_notification_access_manager_; return &fake_notification_access_manager_;
} }
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "chromeos/components/phonehub/fake_do_not_disturb_controller.h" #include "chromeos/components/phonehub/fake_do_not_disturb_controller.h"
#include "chromeos/components/phonehub/fake_feature_status_provider.h" #include "chromeos/components/phonehub/fake_feature_status_provider.h"
#include "chromeos/components/phonehub/fake_find_my_device_controller.h"
#include "chromeos/components/phonehub/fake_notification_access_manager.h" #include "chromeos/components/phonehub/fake_notification_access_manager.h"
#include "chromeos/components/phonehub/fake_notification_manager.h" #include "chromeos/components/phonehub/fake_notification_manager.h"
#include "chromeos/components/phonehub/fake_tether_controller.h" #include "chromeos/components/phonehub/fake_tether_controller.h"
...@@ -32,6 +33,10 @@ class FakePhoneHubManager : public PhoneHubManager { ...@@ -32,6 +33,10 @@ class FakePhoneHubManager : public PhoneHubManager {
return &fake_feature_status_provider_; return &fake_feature_status_provider_;
} }
FakeFindMyDeviceController* fake_find_my_device_controller() {
return &fake_find_my_device_controller_;
}
FakeNotificationAccessManager* fake_notification_access_manager() { FakeNotificationAccessManager* fake_notification_access_manager() {
return &fake_notification_access_manager_; return &fake_notification_access_manager_;
} }
...@@ -50,6 +55,7 @@ class FakePhoneHubManager : public PhoneHubManager { ...@@ -50,6 +55,7 @@ class FakePhoneHubManager : public PhoneHubManager {
// PhoneHubManager: // PhoneHubManager:
DoNotDisturbController* GetDoNotDisturbController() override; DoNotDisturbController* GetDoNotDisturbController() override;
FeatureStatusProvider* GetFeatureStatusProvider() override; FeatureStatusProvider* GetFeatureStatusProvider() override;
FindMyDeviceController* GetFindMyDeviceController() override;
NotificationAccessManager* GetNotificationAccessManager() override; NotificationAccessManager* GetNotificationAccessManager() override;
NotificationManager* GetNotificationManager() override; NotificationManager* GetNotificationManager() override;
PhoneModel* GetPhoneModel() override; PhoneModel* GetPhoneModel() override;
...@@ -57,6 +63,7 @@ class FakePhoneHubManager : public PhoneHubManager { ...@@ -57,6 +63,7 @@ class FakePhoneHubManager : public PhoneHubManager {
FakeDoNotDisturbController fake_do_not_disturb_controller_; FakeDoNotDisturbController fake_do_not_disturb_controller_;
FakeFeatureStatusProvider fake_feature_status_provider_; FakeFeatureStatusProvider fake_feature_status_provider_;
FakeFindMyDeviceController fake_find_my_device_controller_;
FakeNotificationAccessManager fake_notification_access_manager_; FakeNotificationAccessManager fake_notification_access_manager_;
FakeNotificationManager fake_notification_manager_; FakeNotificationManager fake_notification_manager_;
MutablePhoneModel mutable_phone_model_; MutablePhoneModel mutable_phone_model_;
......
...@@ -10,6 +10,7 @@ namespace phonehub { ...@@ -10,6 +10,7 @@ namespace phonehub {
class DoNotDisturbController; class DoNotDisturbController;
class FeatureStatusProvider; class FeatureStatusProvider;
class FindMyDeviceController;
class NotificationAccessManager; class NotificationAccessManager;
class NotificationManager; class NotificationManager;
class PhoneModel; class PhoneModel;
...@@ -27,6 +28,7 @@ class PhoneHubManager { ...@@ -27,6 +28,7 @@ class PhoneHubManager {
// Getters for sub-elements. // Getters for sub-elements.
virtual DoNotDisturbController* GetDoNotDisturbController() = 0; virtual DoNotDisturbController* GetDoNotDisturbController() = 0;
virtual FeatureStatusProvider* GetFeatureStatusProvider() = 0; virtual FeatureStatusProvider* GetFeatureStatusProvider() = 0;
virtual FindMyDeviceController* GetFindMyDeviceController() = 0;
virtual NotificationAccessManager* GetNotificationAccessManager() = 0; virtual NotificationAccessManager* GetNotificationAccessManager() = 0;
virtual NotificationManager* GetNotificationManager() = 0; virtual NotificationManager* GetNotificationManager() = 0;
virtual PhoneModel* GetPhoneModel() = 0; virtual PhoneModel* GetPhoneModel() = 0;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "chromeos/components/phonehub/do_not_disturb_controller_impl.h" #include "chromeos/components/phonehub/do_not_disturb_controller_impl.h"
#include "chromeos/components/phonehub/feature_status_provider_impl.h" #include "chromeos/components/phonehub/feature_status_provider_impl.h"
#include "chromeos/components/phonehub/find_my_device_controller_impl.h"
#include "chromeos/components/phonehub/mutable_phone_model.h" #include "chromeos/components/phonehub/mutable_phone_model.h"
#include "chromeos/components/phonehub/notification_access_manager_impl.h" #include "chromeos/components/phonehub/notification_access_manager_impl.h"
#include "chromeos/components/phonehub/notification_manager_impl.h" #include "chromeos/components/phonehub/notification_manager_impl.h"
...@@ -23,6 +24,8 @@ PhoneHubManagerImpl::PhoneHubManagerImpl( ...@@ -23,6 +24,8 @@ PhoneHubManagerImpl::PhoneHubManagerImpl(
feature_status_provider_(std::make_unique<FeatureStatusProviderImpl>( feature_status_provider_(std::make_unique<FeatureStatusProviderImpl>(
device_sync_client, device_sync_client,
multidevice_setup_client)), multidevice_setup_client)),
find_my_device_controller_(
std::make_unique<FindMyDeviceControllerImpl>()),
notification_access_manager_( notification_access_manager_(
std::make_unique<NotificationAccessManagerImpl>(pref_service)), std::make_unique<NotificationAccessManagerImpl>(pref_service)),
notification_manager_(std::make_unique<NotificationManagerImpl>()), notification_manager_(std::make_unique<NotificationManagerImpl>()),
...@@ -40,6 +43,10 @@ FeatureStatusProvider* PhoneHubManagerImpl::GetFeatureStatusProvider() { ...@@ -40,6 +43,10 @@ FeatureStatusProvider* PhoneHubManagerImpl::GetFeatureStatusProvider() {
return feature_status_provider_.get(); return feature_status_provider_.get();
} }
FindMyDeviceController* PhoneHubManagerImpl::GetFindMyDeviceController() {
return find_my_device_controller_.get();
}
NotificationAccessManager* PhoneHubManagerImpl::GetNotificationAccessManager() { NotificationAccessManager* PhoneHubManagerImpl::GetNotificationAccessManager() {
return notification_access_manager_.get(); return notification_access_manager_.get();
} }
...@@ -60,6 +67,7 @@ void PhoneHubManagerImpl::Shutdown() { ...@@ -60,6 +67,7 @@ void PhoneHubManagerImpl::Shutdown() {
tether_controller_.reset(); tether_controller_.reset();
phone_model_.reset(); phone_model_.reset();
notification_access_manager_.reset(); notification_access_manager_.reset();
find_my_device_controller_.reset();
feature_status_provider_.reset(); feature_status_provider_.reset();
do_not_disturb_controller_.reset(); do_not_disturb_controller_.reset();
} }
......
...@@ -36,6 +36,7 @@ class PhoneHubManagerImpl : public PhoneHubManager, public KeyedService { ...@@ -36,6 +36,7 @@ class PhoneHubManagerImpl : public PhoneHubManager, public KeyedService {
// PhoneHubManager: // PhoneHubManager:
DoNotDisturbController* GetDoNotDisturbController() override; DoNotDisturbController* GetDoNotDisturbController() override;
FeatureStatusProvider* GetFeatureStatusProvider() override; FeatureStatusProvider* GetFeatureStatusProvider() override;
FindMyDeviceController* GetFindMyDeviceController() override;
NotificationAccessManager* GetNotificationAccessManager() override; NotificationAccessManager* GetNotificationAccessManager() override;
NotificationManager* GetNotificationManager() override; NotificationManager* GetNotificationManager() override;
PhoneModel* GetPhoneModel() override; PhoneModel* GetPhoneModel() override;
...@@ -47,6 +48,7 @@ class PhoneHubManagerImpl : public PhoneHubManager, public KeyedService { ...@@ -47,6 +48,7 @@ class PhoneHubManagerImpl : public PhoneHubManager, public KeyedService {
std::unique_ptr<DoNotDisturbController> do_not_disturb_controller_; std::unique_ptr<DoNotDisturbController> do_not_disturb_controller_;
std::unique_ptr<FeatureStatusProvider> feature_status_provider_; std::unique_ptr<FeatureStatusProvider> feature_status_provider_;
std::unique_ptr<FindMyDeviceController> find_my_device_controller_;
std::unique_ptr<NotificationAccessManager> notification_access_manager_; std::unique_ptr<NotificationAccessManager> notification_access_manager_;
std::unique_ptr<NotificationManager> notification_manager_; std::unique_ptr<NotificationManager> notification_manager_;
std::unique_ptr<PhoneModel> phone_model_; std::unique_ptr<PhoneModel> phone_model_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment