| Index: chrome/browser/extensions/extension_system_impl.cc
|
| diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
|
| index 771524ebe5ea61801366955afd18a46929d2b934..14a4dfe8d6b87075a38119b4c6666de79be6f2e2 100644
|
| --- a/chrome/browser/extensions/extension_system_impl.cc
|
| +++ b/chrome/browser/extensions/extension_system_impl.cc
|
| @@ -72,12 +72,12 @@
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/app_mode/app_mode_utils.h"
|
| #include "chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h"
|
| -#include "chrome/browser/chromeos/login/users/user.h"
|
| #include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/chromeos/policy/device_local_account.h"
|
| #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/login/login_state.h"
|
| +#include "components/user_manager/user.h"
|
| #endif
|
|
|
| using content::BrowserThread;
|
| @@ -126,7 +126,8 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
|
| new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_)));
|
|
|
| #if defined (OS_CHROMEOS)
|
| - const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser();
|
| + const user_manager::User* user =
|
| + chromeos::UserManager::Get()->GetActiveUser();
|
| policy::DeviceLocalAccount::Type device_local_account_type;
|
| if (user && policy::IsDeviceLocalAccountUser(user->email(),
|
| &device_local_account_type)) {
|
|
|