| 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 6e26e3b6e36489fd3d985a8aa9a38843ebd83b2a..2321a7ad3a426918f088d37071390201ec3c900c 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_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"
|
| +#include "components/user_manager/user_manager.h"
|
| #endif
|
|
|
| #if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| @@ -535,9 +535,9 @@ void GetDeprecatedFeaturesMap(
|
|
|
| void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) {
|
| #if defined(OS_CHROMEOS)
|
| - if (chromeos::UserManager::IsInitialized()) {
|
| + if (user_manager::UserManager::IsInitialized()) {
|
| const user_manager::User* user =
|
| - chromeos::UserManager::Get()->GetActiveUser();
|
| + user_manager::UserManager::Get()->GetActiveUser();
|
| if (user)
|
| parameters->user_id_hash = user->username_hash();
|
| }
|
|
|