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

Unified Diff: chrome/browser/chromeos/policy/enrollment_config.h

Issue 2221393002: EnrollmentConfig: Switch to default constructor and in-class initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-instate TODO. Created 4 years, 4 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 | « no previous file | chrome/browser/chromeos/policy/enrollment_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/enrollment_config.h
diff --git a/chrome/browser/chromeos/policy/enrollment_config.h b/chrome/browser/chromeos/policy/enrollment_config.h
index 1c36fee8683f773fad059f5ed7b3c10b350ad699..03788c1e3facd5a8a41f34e6e7550fef29759d7d 100644
--- a/chrome/browser/chromeos/policy/enrollment_config.h
+++ b/chrome/browser/chromeos/policy/enrollment_config.h
@@ -49,9 +49,6 @@ struct EnrollmentConfig {
AUTH_MECHANISM_BEST_AVAILABLE,
};
- // Initializes |mode| to MODE_NONE and |management_domain| to empty string.
- EnrollmentConfig();
-
// Whether enrollment should be triggered.
bool should_enroll() const { return mode != MODE_NONE; }
@@ -63,7 +60,7 @@ struct EnrollmentConfig {
}
// Indicates the enrollment flow variant to trigger during OOBE.
- Mode mode;
+ Mode mode = MODE_NONE;
// The domain to enroll the device to, if applicable. If this is not set, the
// device may be enrolled to any domain. Note that for the case where the
@@ -75,7 +72,8 @@ struct EnrollmentConfig {
std::string management_domain;
// The authentication mechanism to use.
- AuthMechanism auth_mechanism;
+ // TODO(drcrash): Change to best available once ZTE is everywhere.
+ AuthMechanism auth_mechanism = AUTH_MECHANISM_INTERACTIVE;
};
} // namespace policy
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/enrollment_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698