Commit c3a2e065 authored by A Olsen's avatar A Olsen Committed by Commit Bot

DeviceSettingsProvider →🚫 DeviceLocalAccount

Removes DeviceSettingsProvider dep on DeviceLocalAccount, since
the settings package is to be moved into src/chromeos/settings,
so the less deps it can have, the easier it will be to move.

This change relies on the fact that there are two identical
enums that are kept in sync - a proto one, and a native C++ one.
The code already has a dependency on the proto, so we can easily
switch to using that enum to avoid depending on DeviceLocalAccount.

Bug: 446937
Change-Id: I1bddb3d7f35b208540f6f02fa027bc11c46d0903
Reviewed-on: https://chromium-review.googlesource.com/c/1264582Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: A Olsen <olsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597116}
parent 8735d635
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h" #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h"
#include "chrome/browser/chromeos/policy/off_hours/off_hours_proto_parser.h" #include "chrome/browser/chromeos/policy/off_hours/off_hours_proto_parser.h"
#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
...@@ -256,7 +255,8 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, ...@@ -256,7 +255,8 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
base::Value(entry->deprecated_public_session_id())); base::Value(entry->deprecated_public_session_id()));
entry_dict->SetKey( entry_dict->SetKey(
kAccountsPrefDeviceLocalAccountsKeyType, kAccountsPrefDeviceLocalAccountsKeyType,
base::Value(policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)); base::Value(
em::DeviceLocalAccountInfoProto::ACCOUNT_TYPE_PUBLIC_SESSION));
} }
account_list->Append(std::move(entry_dict)); account_list->Append(std::move(entry_dict));
} }
......
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