Commit e542208a authored by Jana Grill's avatar Jana Grill Committed by Chromium LUCI CQ

Adjust VersionInfoUpdater for FlexOrgs

Replace references to enterprise_display_domain with enterprise_manager.

Additionally replace a call to
BrowserPolicyConnectorChromeOS::GetEnterpriseDisplayDomain with a call
to BrowserPolicyConnectorChromeOS::GetEnterpriseDomainManager.

Bug: b:172684922
Test: None
Change-Id: I604450887da6c54e8747b5a4d679179dc13b056b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584929Reviewed-by: default avatarBrian Malcolm <bmalcolm@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Jana Grill <janagrill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836626}
parent 3ffda819
...@@ -145,19 +145,19 @@ void VersionInfoUpdater::UpdateVersionLabel() { ...@@ -145,19 +145,19 @@ void VersionInfoUpdater::UpdateVersionLabel() {
void VersionInfoUpdater::UpdateEnterpriseInfo() { void VersionInfoUpdater::UpdateEnterpriseInfo() {
policy::BrowserPolicyConnectorChromeOS* connector = policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos(); g_browser_process->platform_part()->browser_policy_connector_chromeos();
SetEnterpriseInfo(connector->GetEnterpriseDisplayDomain(), SetEnterpriseInfo(connector->GetEnterpriseDomainManager(),
connector->GetDeviceAssetID()); connector->GetDeviceAssetID());
} }
void VersionInfoUpdater::SetEnterpriseInfo( void VersionInfoUpdater::SetEnterpriseInfo(
const std::string& enterprise_display_domain, const std::string& enterprise_manager,
const std::string& asset_id) { const std::string& asset_id) {
// Update the notification about device status reporting. // Update the notification about device status reporting.
if (delegate_ && !enterprise_display_domain.empty()) { if (delegate_ && !enterprise_manager.empty()) {
std::string enterprise_info; std::string enterprise_info;
enterprise_info = l10n_util::GetStringFUTF8( enterprise_info = l10n_util::GetStringFUTF8(
IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(), IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(),
base::UTF8ToUTF16(enterprise_display_domain)); base::UTF8ToUTF16(enterprise_manager));
delegate_->OnEnterpriseInfoUpdated(enterprise_info, asset_id); delegate_->OnEnterpriseInfoUpdated(enterprise_info, asset_id);
} }
} }
......
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