| Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| index df9cadfc219b0d92d18f557e4a9e5ed02c9bb18a..ae91b0f435161f5e870c634cefc8fb1d6edbf9bb 100644
|
| --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| @@ -38,10 +38,10 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "ash/magnifier/magnifier_constants.h"
|
| -#include "chrome/browser/chromeos/login/users/user.h"
|
| #include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"
|
| #include "chromeos/dbus/power_policy_controller.h"
|
| +#include "components/user_manager/user.h"
|
| #endif
|
|
|
| #if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| @@ -533,7 +533,8 @@ void GetDeprecatedFeaturesMap(
|
| void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) {
|
| #if defined(OS_CHROMEOS)
|
| if (chromeos::UserManager::IsInitialized()) {
|
| - const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser();
|
| + const user_manager::User* user =
|
| + chromeos::UserManager::Get()->GetActiveUser();
|
| if (user)
|
| parameters->user_id_hash = user->username_hash();
|
| }
|
|
|