Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3770)

Unified Diff: chrome/browser/chromeos/login/version_info_updater.cc

Issue 11946017: Remove old cloud policy code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/version_info_updater.cc
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index 0defff1eb480fefdd9109ece2e1dd0b1c3e71b5a..cc596f5933c30ee1559ed42464102d1d00a6f467 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -75,23 +75,6 @@ void VersionInfoUpdater::StartUpdate(bool is_official_build) {
UpdateVersionLabel();
}
- policy::CloudPolicySubsystem* cloud_policy =
- g_browser_process->browser_policy_connector()->
- device_cloud_policy_subsystem();
- if (cloud_policy) {
- // Two-step reset because we want to construct new ObserverRegistrar after
- // destruction of old ObserverRegistrar to avoid DCHECK violation because
- // of adding existing observer.
- cloud_policy_registrar_.reset();
- cloud_policy_registrar_.reset(
- new policy::CloudPolicySubsystem::ObserverRegistrar(
- cloud_policy, this));
-
- // Ensure that we have up-to-date enterprise info in case enterprise policy
- // is already fetched and has finished initialization.
- UpdateEnterpriseInfo();
- }
-
policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
g_browser_process->browser_policy_connector()->
GetDeviceCloudPolicyManager();
@@ -133,20 +116,13 @@ void VersionInfoUpdater::UpdateEnterpriseInfo() {
}
void VersionInfoUpdater::SetEnterpriseInfo(const std::string& domain_name) {
- if (domain_name != enterprise_domain_text_) {
- enterprise_domain_text_ = domain_name;
- UpdateVersionLabel();
-
- // Update the notification about device status reporting.
- if (delegate_) {
- std::string enterprise_info;
- if (!domain_name.empty()) {
- enterprise_info = l10n_util::GetStringFUTF8(
- IDS_DEVICE_OWNED_BY_NOTICE,
- UTF8ToUTF16(domain_name));
- delegate_->OnEnterpriseInfoUpdated(enterprise_info);
- }
- }
+ // Update the notification about device status reporting.
+ if (delegate_ && !domain_name.empty()) {
+ std::string enterprise_info;
+ enterprise_info = l10n_util::GetStringFUTF8(
+ IDS_DEVICE_OWNED_BY_NOTICE,
+ UTF8ToUTF16(domain_name));
+ delegate_->OnEnterpriseInfoUpdated(enterprise_info);
}
}
@@ -188,12 +164,6 @@ void VersionInfoUpdater::OnBootTimes(
delegate_->OnBootTimesLabelTextUpdated(boot_times_text);
}
-void VersionInfoUpdater::OnPolicyStateChanged(
- policy::CloudPolicySubsystem::PolicySubsystemState state,
- policy::CloudPolicySubsystem::ErrorDetails error_details) {
- UpdateEnterpriseInfo();
-}
-
void VersionInfoUpdater::OnStoreLoaded(policy::CloudPolicyStore* store) {
UpdateEnterpriseInfo();
}
« no previous file with comments | « chrome/browser/chromeos/login/version_info_updater.h ('k') | chrome/browser/policy/browser_policy_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698