diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 14:31:49 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 14:31:49 +0000 |
| commit | 3dab7b72278dcecce11e06eea61a140716b6aaaa (patch) | |
| tree | 1e3e0e304acb38e0e629b0f42c0624e82e7db63c /chromeos/settings | |
| parent | 582cd8ac6950df6de81b4fb2a24be70c9077ca61 (diff) | |
| download | chromium_src-3dab7b72278dcecce11e06eea61a140716b6aaaa.zip chromium_src-3dab7b72278dcecce11e06eea61a140716b6aaaa.tar.gz chromium_src-3dab7b72278dcecce11e06eea61a140716b6aaaa.tar.bz2 | |
Read robot account ID from CrosSettings.
This way, we can make use of the device settings cache maintained by
DeviceSettingsProvider. DeviceOAuth2TokenService::GetRobotAccountID()
can then return the correct value even during startup when
DeviceSettingsService hasn't pulled in device settings via DBus yet.
This fixes a theoretical race with robot account token minting failing
for requests issued right after Chrome startup.
BUG=chromium:346283
TBR=satorux@chromium.org
Review URL: https://codereview.chromium.org/177913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/settings')
| -rw-r--r-- | chromeos/settings/cros_settings_names.cc | 4 | ||||
| -rw-r--r-- | chromeos/settings/cros_settings_names.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/settings/cros_settings_names.cc b/chromeos/settings/cros_settings_names.cc index d28c01d..f70a202 100644 --- a/chromeos/settings/cros_settings_names.cc +++ b/chromeos/settings/cros_settings_names.cc @@ -143,4 +143,8 @@ const char kDeviceAttestationEnabled[] = "cros.device.attestation_enabled"; const char kAttestationForContentProtectionEnabled[] = "cros.device.attestation_for_content_protection_enabled"; +// The service account identity for device-level service accounts on +// enterprise-enrolled devices. +const char kServiceAccountIdentity[] = "cros.service_account_identity"; + } // namespace chromeos diff --git a/chromeos/settings/cros_settings_names.h b/chromeos/settings/cros_settings_names.h index 854c6bc..1e1097e 100644 --- a/chromeos/settings/cros_settings_names.h +++ b/chromeos/settings/cros_settings_names.h @@ -83,6 +83,8 @@ CHROMEOS_EXPORT extern const char kVariationsRestrictParameter[]; CHROMEOS_EXPORT extern const char kDeviceAttestationEnabled[]; CHROMEOS_EXPORT extern const char kAttestationForContentProtectionEnabled[]; +CHROMEOS_EXPORT extern const char kServiceAccountIdentity[]; + } // namespace chromeos #endif // CHROMEOS_SETTINGS_CROS_SETTINGS_NAMES_H_ |