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

Unified Diff: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

Issue 2323593002: Messaging for successful attestation-based enrollment. (Closed)
Patch Set: Created 4 years, 3 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/ui/webui/chromeos/login/enrollment_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
index 0885d44a886d5f1c472240ef9efefbb35ec13c30..5e04c2a76f23685a2a56c8f384450b8e43a9da1d 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -93,6 +93,14 @@ bool IsProxyError(NetworkStateInformer::State state,
reason == NetworkError::ERROR_REASON_PROXY_CONNECTION_FAILED;
}
+
+// Returns the enterprise domain after enrollment, or an empty string.
+std::string GetEnterpriseDomain() {
+ policy::BrowserPolicyConnectorChromeOS* connector =
+ g_browser_process->platform_part()->browser_policy_connector_chromeos();
+ return connector->GetEnterpriseDomain();
achuithb 2016/09/08 02:24:05 We're sure this isn't crashy, right?
The one and only Dr. Crash 2016/09/08 03:48:18 Pretty sure. If we crash, so will the Gaia screen
+}
+
} // namespace
// EnrollmentScreenHandler, public ------------------------------
@@ -178,6 +186,11 @@ void EnrollmentScreenHandler::ShowEnrollmentSpinnerScreen() {
ShowStep(kEnrollmentStepWorking);
}
+void EnrollmentScreenHandler::ShowAttestationBasedEnrollmentSuccess(
+ const std::string& enterprise_domain) {
+ CallJS("showAttestationBasedEnrollmentSuccess", enterprise_domain);
+}
+
void EnrollmentScreenHandler::ShowAuthError(
const GoogleServiceAuthError& error) {
switch (error.state()) {
@@ -224,7 +237,10 @@ void EnrollmentScreenHandler::ShowEnrollmentStatus(
policy::EnrollmentStatus status) {
switch (status.status()) {
case policy::EnrollmentStatus::STATUS_SUCCESS:
- ShowStep(kEnrollmentStepSuccess);
+ if (config_.is_mode_attestation())
+ ShowAttestationBasedEnrollmentSuccess(GetEnterpriseDomain());
+ else
+ ShowStep(kEnrollmentStepSuccess);
return;
case policy::EnrollmentStatus::STATUS_NO_STATE_KEYS:
ShowError(IDS_ENTERPRISE_ENROLLMENT_STATUS_NO_STATE_KEYS, false);
@@ -349,6 +365,7 @@ void EnrollmentScreenHandler::DeclareLocalizedValues(
builder->Add("oauthEnrollNextBtn", IDS_OFFLINE_LOGIN_NEXT_BUTTON_TEXT);
builder->Add("oauthEnrollSkip", IDS_ENTERPRISE_ENROLLMENT_SKIP);
builder->Add("oauthEnrollSuccess", IDS_ENTERPRISE_ENROLLMENT_SUCCESS);
+ builder->Add("oauthEnrollAbeSuccess", IDS_ENTERPRISE_ENROLLMENT_ABE_SUCCESS);
builder->Add("oauthEnrollDeviceInformation",
IDS_ENTERPRISE_ENROLLMENT_DEVICE_INFORMATION);
builder->Add("oauthEnrollExplaneAttributeLink",

Powered by Google App Engine
This is Rietveld 408576698