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

Unified Diff: components/update_client/updater_state.cc

Issue 2710713004: Revert "Use the Windows MDM API to check if the machine is being managed." (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « components/update_client/updater_state.h ('k') | components/update_client/updater_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/update_client/updater_state.cc
diff --git a/components/update_client/updater_state.cc b/components/update_client/updater_state.cc
index 0c8f414cdbf0ed70151c3219bf07245045d4c326..035e6c2f2302ec3e78fc02b1737488c6b81017da 100644
--- a/components/update_client/updater_state.cc
+++ b/components/update_client/updater_state.cc
@@ -15,11 +15,7 @@
namespace update_client {
-// The value of this constant does not reflect its name (i.e. "domainjoined"
-// vs something like "isenterprisemanaged") because it is used with omaha.
-// After discussion with omaha team it was decided to leave the value as is to
-// keep continuity with previous chrome versions.
-const char UpdaterState::kIsEnterpriseManaged[] = "domainjoined";
+const char UpdaterState::kDomainJoined[] = "domainjoined";
UpdaterState::UpdaterState(bool is_machine) : is_machine_(is_machine) {}
@@ -38,7 +34,7 @@ std::unique_ptr<UpdaterState::Attributes> UpdaterState::GetState(
#if defined(OS_WIN)
void UpdaterState::ReadState() {
- is_enterprise_managed_ = IsEnterpriseManaged();
+ is_joined_to_domain_ = IsJoinedToDomain();
#if defined(GOOGLE_CHROME_BUILD)
updater_name_ = GetUpdaterName();
@@ -54,7 +50,7 @@ void UpdaterState::ReadState() {
UpdaterState::Attributes UpdaterState::BuildAttributes() const {
Attributes attributes;
- attributes[kIsEnterpriseManaged] = is_enterprise_managed_ ? "1" : "0";
+ attributes[kDomainJoined] = is_joined_to_domain_ ? "1" : "0";
attributes["name"] = updater_name_;
« no previous file with comments | « components/update_client/updater_state.h ('k') | components/update_client/updater_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698