OOBE: Remove extra divs from Enterprise Enrollment

Remove extra divs to eliminate the OobeDialogHostBehavior.

Bug: 1159461
Change-Id: I91349988eb89e840e5e460ce909a87ba5378f216
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2605559
Commit-Queue: Ossama Mahmoud <osamafathy@google.com>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845459}

chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc

@@ -91,7 +91,7 @@ constexpr char kAdDomainJoinUnlockedConfig[] = R"!!!(
 )!!!";
 
 constexpr char kEnrollmentUI[] = "enterprise-enrollment";
-constexpr char kAdDialog[] = "adJoinUI";
+constexpr char kAdDialog[] = "step-ad-join";
 
 const test::UIPath kBackButton = {kEnrollmentUI, "signinBackButton"};
 const test::UIPath kAdRetryButton = {kEnrollmentUI, "adRetryButton"};

chrome/browser/resources/chromeos/login/enterprise_enrollment.css

-/* Copyright 2015 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  padding: 0;
-}
-
-#stepContents,
-#stepContents > div {
-  height: 100%;
-  width: 100%;
-}
-
-#stepContents {
-  color: #666;
-}
-
-#authView {
-  display: block;
-  overflow: hidden;
-  position: static;
-}
-
-#learnMoreLink {
-  display: inline;
-}
-
-.step-message {
-  display: inline-block;
-  padding-top: 20px;
-  text-align: start;
-  vertical-align: top;
-}
-
-#samlNoticeContainer {
-  align-items: center;
-  background: rgb(241, 243, 244); /* #F1F3F4 */
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.17);
-  display: flex;
-  height: 44px;
-  min-height: 0;
-}
-
-#samlNoticeMessage {
-  color: rgb(106, 106, 106);
-  font-size: 13px;
-}
-
-#attributePromptMessage {
-  color: black;
-}
-
-#navigation {
-  color: rgba(0, 0, 0, .54);
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: 1;
-}
-
-#signinFrameContainer {
-  z-index: 10;
-}
-
-#samlCloseButton {
-  --cr-icon-button-margin-end: 0;
-  --cr-icon-button-margin-start: 0;
-}
-
-/* WebviewScrollShadowsHelper */
-#authView.can-scroll:not(.is-scrolled):not(.scrolled-to-bottom)::before {
-  @apply --oobe-scroll-shadow-bottom;
-}
-#authView.can-scroll.is-scrolled:not(.scrolled-to-bottom)::before {
-  @apply --oobe-scroll-shadow-top-and-bottom;
-}
-#authView.is-scrolled.scrolled-to-bottom::before {
-  @apply --oobe-scroll-shadow-top;
-}

chrome/browser/resources/chromeos/login/enterprise_enrollment.js

@@ -50,7 +50,6 @@ Polymer({
 
   behaviors: [
     OobeI18nBehavior,
-    OobeDialogHostBehavior,
     LoginScreenBehavior,
     MultiStepBehavior,
   ],
@@ -235,16 +234,16 @@ Polymer({
           chrome.send('oauthEnrollCompleteLogin', [detail.email]);
         }).bind(this));
 
-    this.$.adJoinUI.addEventListener('authCompleted', function(e) {
-      this.$.adJoinUI.disabled = true;
-      this.$.adJoinUI.loading = true;
+    this.$["step-ad-join"].addEventListener('authCompleted', function(e) {
+      this.$["step-ad-join"].disabled = true;
+      this.$["step-ad-join"].loading = true;
       chrome.send('oauthEnrollAdCompleteLogin', [
         e.detail.machine_name, e.detail.distinguished_name,
         e.detail.encryption_types, e.detail.username, e.detail.password
       ]);
     }.bind(this));
-    this.$.adJoinUI.addEventListener('unlockPasswordEntered', function(e) {
-      this.$.adJoinUI.disabled = true;
+    this.$["step-ad-join"].addEventListener('unlockPasswordEntered', function(e) {
+      this.$["step-ad-join"].disabled = true;
       chrome.send(
           'oauthEnrollAdUnlockConfiguration', [e.detail.unlock_password]);
     }.bind(this));
@@ -336,7 +335,7 @@ Polymer({
     this.isAutoEnroll_ = data.attestationBased;
 
     this.authenticatorDialogDisplayed_ = false;
-    cr.ui.login.invokePolymerMethod(this.$.adJoinUI, 'onBeforeShow');
+    cr.ui.login.invokePolymerMethod(this.$["step-ad-join"], 'onBeforeShow');
     if (!this.uiStep) {
       this.showStep(data.attestationBased ?
           ENROLLMENT_STEP.WORKING : ENROLLMENT_STEP.SIGNIN);
@@ -355,7 +354,7 @@ Polymer({
    * Executed on language change.
    */
   updateLocalizedContent: function() {
-    this.$.adJoinUI.i18nUpdateLocale();
+    this.$["step-ad-join"].i18nUpdateLocale();
     this.i18nUpdateLocale();
   },
 
@@ -400,9 +399,9 @@ Polymer({
   showStep(step) {
     this.setUIStep(step);
     if (step === ENROLLMENT_STEP.AD_JOIN) {
-      this.$.adJoinUI.disabled = false;
-      this.$.adJoinUI.loading = false;
-      this.$.adJoinUI.focus();
+      this.$["step-ad-join"].disabled = false;
+      this.$["step-ad-join"].loading = false;
+      this.$["step-ad-join"].focus();
     }
     this.isCancelDisabled =
         (step === ENROLLMENT_STEP.SIGNIN && !this.isManualEnrollment_) ||
@@ -425,14 +424,14 @@ Polymer({
    * configuration (and not unlocked yet).
    */
   setAdJoinParams(machineName, userName, errorState, showUnlockConfig) {
-    this.$.adJoinUI.disabled = false;
-    this.$.adJoinUI.machineName = machineName;
-    this.$.adJoinUI.userName = userName;
-    this.$.adJoinUI.errorState = errorState;
+    this.$["step-ad-join"].disabled = false;
+    this.$["step-ad-join"].machineName = machineName;
+    this.$["step-ad-join"].userName = userName;
+    this.$["step-ad-join"].errorState = errorState;
     if (showUnlockConfig) {
-      this.$.adJoinUI.setUIStep(adLoginStep.UNLOCK);
+      this.$["step-ad-join"].setUIStep(adLoginStep.UNLOCK);
     } else {
-      this.$.adJoinUI.setUIStep(adLoginStep.CREDS);
+      this.$["step-ad-join"].setUIStep(adLoginStep.CREDS);
     }
   },
 
@@ -441,10 +440,10 @@ Polymer({
    * @param {Array<JoinConfigType>} options
    */
   setAdJoinConfiguration(options) {
-    this.$.adJoinUI.disabled = false;
-    this.$.adJoinUI.setJoinConfigurationOptions(options);
-    this.$.adJoinUI.setUIStep(adLoginStep.CREDS);
-    this.$.adJoinUI.focus();
+    this.$["step-ad-join"].disabled = false;
+    this.$["step-ad-join"].setJoinConfigurationOptions(options);
+    this.$["step-ad-join"].setUIStep(adLoginStep.CREDS);
+    this.$["step-ad-join"].focus();
   },
 
   /**