oobe: Migrate mutlideviceSetup wrapper to LoginScreenBehavior

Bug: 1106341
Change-Id: Ice17e0d2d4bee5d3c1fad84460e3d63cc7d94467
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2565714Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Roman Aleksandrov <raleksandrov@google.com>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Auto-Submit: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834226}

chrome/browser/chromeos/login/screens/multidevice_setup_screen_browsertest.cc

@@ -22,6 +22,9 @@
 
 namespace chromeos {
 
+constexpr test::UIPath kMultideviceSetupPath = {"multidevice-setup-screen",
+                                                "impl", "multideviceSetup"};
+
 class MultiDeviceSetupScreenTest : public OobeBaseTest {
  public:
   MultiDeviceSetupScreenTest() = default;
@@ -61,17 +64,17 @@ class MultiDeviceSetupScreenTest : public OobeBaseTest {
   }
 
   void FinishDeviceSetup() {
+    const std::string elementJS =
+        test::GetOobeElementPath(kMultideviceSetupPath);
     test::OobeJS().Evaluate(
-        R"($('multidevice-setup-impl')
-          .$['multideviceSetup']
-          .fire('setup-exited', {didUserCompleteSetup: true});)");
+        elementJS + R"(.fire('setup-exited', {didUserCompleteSetup: true});)");
   }
 
   void CancelDeviceSetup() {
+    const std::string elementJS =
+        test::GetOobeElementPath(kMultideviceSetupPath);
     test::OobeJS().Evaluate(
-        R"($('multidevice-setup-impl')
-          .$['multideviceSetup']
-          .fire('setup-exited', {didUserCompleteSetup: false});)");
+        elementJS + R"(.fire('setup-exited', {didUserCompleteSetup: false});)");
   }
 
   void WaitForScreenShown() {
@@ -129,9 +132,9 @@ IN_PROC_BROWSER_TEST_F(MultiDeviceSetupScreenTest, Accepted) {
   WaitForScreenExit();
   EXPECT_EQ(screen_result_.value(), MultiDeviceSetupScreen::Result::NEXT);
   histogram_tester_.ExpectTotalCount(
-      "OOBE.StepCompletionTimeByExitReason.Multidevice-setup.Next", 1);
+      "OOBE.StepCompletionTimeByExitReason.Multidevice-setup-screen.Next", 1);
   histogram_tester_.ExpectTotalCount(
-      "OOBE.StepCompletionTime.Multidevice-setup", 1);
+      "OOBE.StepCompletionTime.Multidevice-setup-screen", 1);
   CheckUserChoice(true);
 }
 
@@ -145,9 +148,9 @@ IN_PROC_BROWSER_TEST_F(MultiDeviceSetupScreenTest, Declined) {
   WaitForScreenExit();
   EXPECT_EQ(screen_result_.value(), MultiDeviceSetupScreen::Result::NEXT);
   histogram_tester_.ExpectTotalCount(
-      "OOBE.StepCompletionTimeByExitReason.Multidevice-setup.Next", 1);
+      "OOBE.StepCompletionTimeByExitReason.Multidevice-setup-screen.Next", 1);
   histogram_tester_.ExpectTotalCount(
-      "OOBE.StepCompletionTime.Multidevice-setup", 1);
+      "OOBE.StepCompletionTime.Multidevice-setup-screen", 1);
   CheckUserChoice(false);
 }
 
@@ -158,9 +161,9 @@ IN_PROC_BROWSER_TEST_F(MultiDeviceSetupScreenTest, Skipped) {
   EXPECT_EQ(screen_result_.value(),
             MultiDeviceSetupScreen::Result::NOT_APPLICABLE);
   histogram_tester_.ExpectTotalCount(
-      "OOBE.StepCompletionTimeByExitReason.Multidevice-setup.Next", 0);
+      "OOBE.StepCompletionTimeByExitReason.Multidevice-setup-screen.Next", 0);
   histogram_tester_.ExpectTotalCount(
-      "OOBE.StepCompletionTime.Multidevice-setup", 0);
+      "OOBE.StepCompletionTime.Multidevice-setup-screen", 0);
 }
 
 }  // namespace chromeos

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

@@ -24,7 +24,6 @@
 
 // <include src="screen_error_message.js">
 // <include src="screen_discover.js">
-// <include src="screen_multidevice_setup.js">
 
 // <include src="../../gaia_auth_host/authenticator.js">
 
@@ -52,7 +51,6 @@ HTMLImports.whenReady(() => {
         login.AutolaunchScreen.register();
         login.ErrorMessageScreen.register();
         login.DiscoverScreen.register();
-        login.MultiDeviceSetupScreen.register();
 
         cr.ui.Bubble.decorate($('bubble-persistent'));
         $('bubble-persistent').persistent = true;

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

@@ -25,7 +25,6 @@
 
 // <include src="screen_error_message.js">
 // <include src="screen_discover.js">
-// <include src="screen_multidevice_setup.js">
 
 // <include src="../../gaia_auth_host/authenticator.js">
 // <include src="multi_tap_detector.js">
@@ -44,7 +43,6 @@ HTMLImports.whenReady(() => {
         login.AccountPickerScreen.register();
         login.ErrorMessageScreen.register();
         login.DiscoverScreen.register();
-        login.MultiDeviceSetupScreen.register();
 
         cr.ui.Bubble.decorate($('bubble-persistent'));
         $('bubble-persistent').persistent = true;

chrome/browser/resources/chromeos/login/screen_multidevice_setup.html

 <!-- Copyright 2018 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. -->
+<link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://oobe/custom_elements.html">
-<link rel="stylesheet" href="chrome://resources/css/overlay.css">
 
-<div class="step right hidden" id="multidevice-setup" hidden>
-  <multidevice-setup-first-run id="multidevice-setup-impl">
-  </multidevice-setup-first-run>
-</div>
+<dom-module id="multidevice-setup-element">
+  <template>
+    <multidevice-setup-first-run id="impl">
+    </multidevice-setup-first-run>
+  </template>
+</dom-module>

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

@@ -5,17 +5,22 @@
 /**
  * @fileoverview MultiDevice setup screen for login/OOBE.
  */
-login.createScreen('MultiDeviceSetupScreen', 'multidevice-setup', function() {
-  return {
-    get defaultControl() {
-      return $('multidevice-setup-impl');
-    },
 
-    /**
-     * This is called after resources are updated.
-     */
-    updateLocalizedContent() {
-      $('multidevice-setup-impl').updateLocalizedContent();
-    },
-  };
+Polymer({
+  is: 'multidevice-setup-element',
+
+  behaviors: [OobeI18nBehavior, LoginScreenBehavior],
+
+  ready() {
+    this.initializeLoginScreen('MultiDeviceSetupScreen', {});
+  },
+
+
+  get defaultControl() {
+    return this.$.impl;
+  },
+
+  updateLocalizedContent() {
+    this.$.impl.updateLocalizedContent();
+  },
 });

chrome/browser/resources/chromeos/login/structure/components_common.html

@@ -44,6 +44,7 @@
 <include src="../marketing_opt_in.html">
 <include src="../oobe_screen_assistant_optin_flow.html">
 <include src="../multidevice_setup_first_run.html">
+<include src="../screen_multidevice_setup.html">
 <include src="../security_token_pin.html">
 <include src="../gesture_navigation.html">
 <include src="../screen_tpm_error.html">

chrome/browser/resources/chromeos/login/structure/components_common.js

@@ -43,6 +43,7 @@ function loadCommonComponents() {
 // <include src="../marketing_opt_in.js">
 // <include src="../oobe_screen_assistant_optin_flow.js">
 // <include src="../multidevice_setup_first_run.js">
+// <include src="../screen_multidevice_setup.js">
 // <include src="../security_token_pin.js">
 // <include src="../gesture_navigation.js">
 // <include src="../screen_tpm_error.js">

chrome/browser/resources/chromeos/login/structure/screens_common.html

@@ -44,7 +44,9 @@
 <app-downloading-element id="app-downloading" class="step hidden" hidden>
 </app-downloading-element>
 <include src="../screen_discover.html">
-<include src="../screen_multidevice_setup.html">
+<multidevice-setup-element id="multidevice-setup-screen" class="step hidden"
+    hidden>
+</multidevice-setup-element>
 <gesture-navigation-element id="gesture-navigation" class="step hidden" hidden>
 </gesture-navigation-element>
 <marketing-opt-in-element id="marketing-opt-in" class="step hidden" hidden>

chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.h

@@ -16,7 +16,7 @@ class MultiDeviceSetupScreen;
 // WebUI representation.
 class MultiDeviceSetupScreenView {
  public:
-  constexpr static StaticOobeScreenId kScreenId{"multidevice-setup"};
+  constexpr static StaticOobeScreenId kScreenId{"multidevice-setup-screen"};
 
   virtual ~MultiDeviceSetupScreenView() = default;
 

tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml

@@ -11966,7 +11966,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Image" label=""/>
   <suffix name="Kiosk-enable" label=""/>
   <suffix name="Marketing-opt-in" label=""/>
-  <suffix name="Multidevice-setup" label=""/>
+  <suffix name="Multidevice-setup" label="">
+    <obsolete>
+      Renamed to Multidevice-setup-screen in M89.
+    </obsolete>
+  </suffix>
+  <suffix name="Multidevice-setup-screen" label=""/>
   <suffix name="Network" label=""/>
   <suffix name="Network-selection" label=""/>
   <suffix name="Packaged-license" label=""/>
@@ -12019,7 +12024,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Hid-detection.StartDemo" label=""/>
   <suffix name="Kiosk-enable.Next" label=""/>
   <suffix name="Marketing-opt-in.Next" label=""/>
-  <suffix name="Multidevice-setup.Next" label=""/>
+  <suffix name="Multidevice-setup-screen.Next" label=""/>
+  <suffix name="Multidevice-setup.Next" label="">
+    <obsolete>
+      Renamed to Multidevice-setup-screen.Next in M89.
+    </obsolete>
+  </suffix>
   <suffix name="Network-selection.Back" label=""/>
   <suffix name="Network-selection.Connected" label=""/>
   <suffix name="Network-selection.OfflineDemoSetup" label=""/>