| Index: chrome/browser/chromeos/login/users/user_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/users/user_manager_impl.cc b/chrome/browser/chromeos/login/users/user_manager_impl.cc
|
| index d5ba93364c57a2ca8e6b9621dcc51bdb38061124..86bf5da27df83aacbfeb3e2acbe9005088a5e027 100644
|
| --- a/chrome/browser/chromeos/login/users/user_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/login/users/user_manager_impl.cc
|
| @@ -43,6 +43,7 @@
|
| #include "chrome/browser/chromeos/login/wizard_controller.h"
|
| #include "chrome/browser/chromeos/net/network_portal_detector.h"
|
| #include "chrome/browser/chromeos/net/network_portal_detector_strategy.h"
|
| +#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/device_local_account.h"
|
| #include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
|
| @@ -1566,10 +1567,8 @@ void UserManagerImpl::NotifyOnLogin() {
|
| // Owner must be first user in session. DeviceSettingsService can't deal with
|
| // multiple user and will mix up ownership, crbug.com/230018.
|
| if (GetLoggedInUsers().size() == 1) {
|
| - // Indicate to DeviceSettingsService that the owner key may have become
|
| - // available.
|
| - DeviceSettingsService::Get()->SetUsername(active_user_->email());
|
| -
|
| + OwnerSettingsServiceFactory::GetInstance()->SetUsername(
|
| + active_user_->email());
|
| if (NetworkPortalDetector::IsInitialized()) {
|
| NetworkPortalDetector::Get()->SetStrategy(
|
| PortalDetectorStrategy::STRATEGY_ID_SESSION);
|
|
|