[CrOS MultiDevice] Prepare settings UI infrastrcture for feature data.

This CL replaces some data types we had thought would be important for
displaying the multidevice settings page that wound up being redundant
with the data types we will need to receive individual feature updates
from the multidevice service.

Bug: 824568
Change-Id: I33b70cba332dec8cf7726630ccbf57bcf62b8655
Reviewed-on: https://chromium-review.googlesource.com/1173658
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583724}

chrome/browser/resources/settings/multidevice_page/multidevice_constants.js

@@ -19,70 +19,47 @@ cr.define('settings', function() {
   };
 
   /**
-   * MultiDevice software features. Note that this is copied from (and must
-   * include an analog of all values in) the enum of the same name in
-   * //components/cryptauth/proto/cryptauth_api.proto.
+   * Possible states of MultiDevice features. Note that this is copied from (and
+   * must include an analog of all values in) the FeatureState enum in
+   * //chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.
    * @enum {number}
    */
-  MultiDeviceSoftwareFeature = {
-    UNKNOWN_FEATURE: 0,
-    BETTER_TOGETHER_HOST: 1,
-    BETTER_TOGETHER_CLIENT: 2,
-    EASY_UNLOCK_HOST: 3,
-    EASY_UNLOCK_CLIENT: 4,
-    MAGIC_TETHER_HOST: 5,
-    MAGIC_TETHER_CLIENT: 6,
-    SMS_CONNECT_HOST: 7,
-    SMS_CONNECT_CLIENT: 8,
-  };
-
-  /**
-   * Possible states of MultiDevice software features. Note that this is based
-   * on (and must include an analog of all values in) the enum of the same name
-   * in //components/cryptauth/software_feature_state.h.
-   * @enum {number}
-   */
-  MultiDeviceSoftwareFeatureState = {
-    NOT_SUPPORTED: 0,
-    SUPPORTED: 1,
-    ENABLED: 2,
+  MultiDeviceFeatureState = {
+    DISABLED_BY_POLICY: 0,
+    DISABLED_BY_USER: 1,
+    ENABLED_BY_USER: 2,
+    NOT_SUPPORTED_BY_CHROMEBOOK: 3,
+    NOT_SUPPORTED_BY_PHONE: 4,
+    UNAVAILABLE_NO_VERIFIED_HOST: 5,
+    UNAVAILABLE_INSUFFICIENT_SECURITY: 6,
   };
 
   return {
     MultiDeviceSettingsMode: MultiDeviceSettingsMode,
-    MultiDeviceSoftwareFeature: MultiDeviceSoftwareFeature,
-    MultiDeviceSoftwareFeatureState: MultiDeviceSoftwareFeatureState,
+    MultiDeviceFeatureState: MultiDeviceFeatureState,
   };
 });
 
-/**
- * Represents a multidevice host, i.e. a phone set by the user to connect to
- * their Chromebook(s). The type is a subset of the RemoteDevice structure
- * defined by CryptAuth (components/cryptauth/remote_device.h). It contains the
- * host device's name (e.g. Pixel, Nexus 5) and the map softwareFeatures
- * sending each MultiDevice feature to the host device's state with regards to
- * that feature.
- *
- * @typedef {{
- *   name: string,
- *   softwareFeatures:
- *       !Object<settings.MultiDeviceSoftwareFeature,
- *           settings.MultiDeviceSoftwareFeatureState>
- * }}
- */
-let RemoteDevice;
-
 /**
  * Container for the initial data that the page requires in order to display
  * the correct content. It is also used for receiving status updates during
- * use. Note that the host may be verified (enabled or disabled), awaiting
- * verification, or it may have failed setup because it was not able to connect
- * to the server. If the property is null or undefined, then no host has been
- * set up, although there may be potential hosts on the account.
+ * use. Note that the host device may be verified (enabled or disabled),
+ * awaiting verification, or it may have failed setup because it was not able
+ * to connect to the server.
+ *
+ * For each MultiDevice feature (including the "suite" feature, which acts as a
+ * gatekeeper for the others), the corresponding *State property is an enum
+ * containing the data necessary to display it. Note that hostDeviceName should
+ * be undefined if and only if no host has been set up, regardless of whether
+ * there are potential hosts on the account.
  *
  * @typedef {{
  *   mode: !settings.MultiDeviceSettingsMode,
- *   hostDevice: (RemoteDevice|undefined)
+ *   hostDeviceName: (string|undefined),
+ *   betterTogetherState: !settings.MultiDeviceFeatureState,
+ *   instantTetheringState: !settings.MultiDeviceFeatureState,
+ *   messagesState: !settings.MultiDeviceFeatureState,
+ *   smartLockState: !settings.MultiDeviceFeatureState,
  * }}
  */
 let MultiDevicePageContentData;

chrome/browser/resources/settings/multidevice_page/multidevice_page.html

@@ -58,7 +58,7 @@
       </neon-animatable>
       <template is="dom-if" route-path="/multidevice/features">
         <settings-subpage associated-control="[[$$('#multidevice-item')]]"
-            page-title="[[pageContentData.hostDevice.name]]">
+            page-title="[[pageContentData.hostDeviceName]]">
             <settings-multidevice-subpage prefs="{{prefs}}"
                 page-content-data="[[pageContentData]]">
             </settings-multidevice-subpage>

chrome/browser/resources/settings/multidevice_page/multidevice_page.js

@@ -49,8 +49,7 @@ Polymer({
    * @private
    */
   getLabelText_: function() {
-    return !!this.pageContentData.hostDevice ?
-        this.pageContentData.hostDevice.name :
+    return this.pageContentData.hostDeviceName ||
         this.i18n('multideviceSetupItemHeading');
   },
 

chrome/browser/resources/settings/multidevice_page/multidevice_page_container.js

@@ -71,8 +71,8 @@ Polymer({
 
   /**
    * If the new mode corresponds to no eligible host or unset potential hosts
-   * (i.e. NO_ELIGIBLE_HOSTS or NO_HOST_SET), then newHostDevice should be null
-   * or undefined. Otherwise it should be defined and non-null.
+   * (i.e. NO_ELIGIBLE_HOSTS or NO_HOST_SET), then newHostDeviceName should be
+   * falsy. Otherwise it should be truthy.
    * @param {!MultiDevicePageContentData} newData
    * @private
    */
@@ -81,7 +81,7 @@ Polymer({
       settings.MultiDeviceSettingsMode.NO_ELIGIBLE_HOSTS,
       settings.MultiDeviceSettingsMode.NO_HOST_SET,
     ];
-    return !newData.hostDevice == noHostModes.includes(newData.mode);
+    return !newData.hostDeviceName === noHostModes.includes(newData.mode);
   },
 
   /**

chrome/test/data/webui/settings/multidevice_page_container_tests.js

@@ -36,7 +36,7 @@ suite('Multidevice', function() {
   function getFakePageContentData(mode) {
     return {
       mode: mode,
-      hostDevice: HOST_SET_MODES.includes(mode) ? {name: 'Pixel XL'} : null,
+      hostDeviceName: HOST_SET_MODES.includes(mode) ? 'Pixel XL' : undefined,
     };
   }
 

chrome/test/data/webui/settings/multidevice_page_tests.js

@@ -25,14 +25,12 @@ suite('Multidevice', function() {
   let multidevicePage = null;
   let browserProxy = null;
   let HOST_SET_MODES;
-  const HOST_DEVICE = {
-    name: 'Pixel XL',
-  };
+  const HOST_DEVICE = 'Pixel XL';
 
-  function setPageContentData(newMode, newHostDevice) {
+  function setPageContentData(newMode, newHostDeviceName) {
     multidevicePage.pageContentData = {
       mode: newMode,
-      hostDevice: newHostDevice,
+      hostDeviceName: newHostDeviceName,
     };
     Polymer.dom.flush();
   }
@@ -66,7 +64,7 @@ suite('Multidevice', function() {
   const getSubpage = () => multidevicePage.$$('settings-multidevice-subpage');
 
   test('clicking setup shows multidevice setup dialog', function() {
-    setPageContentData(settings.MultiDeviceSettingsMode.NO_HOST_SET, null);
+    setPageContentData(settings.MultiDeviceSettingsMode.NO_HOST_SET, undefined);
     const button = multidevicePage.$$('paper-button');
     assertTrue(!!button);
     button.click();
@@ -76,25 +74,24 @@ suite('Multidevice', function() {
   test('headings render based on mode and host', function() {
     for (let mode of HOST_SET_MODES) {
       setPageContentData(mode, HOST_DEVICE);
-      assertEquals(getLabel(), HOST_DEVICE.name);
+      assertEquals(getLabel(), HOST_DEVICE);
     }
-    setPageContentData(settings.MultiDeviceSettingsMode.NO_HOST_SET, null);
-    assertNotEquals(getLabel(), HOST_DEVICE.name);
+    setPageContentData(settings.MultiDeviceSettingsMode.NO_HOST_SET, undefined);
+    assertNotEquals(getLabel(), HOST_DEVICE);
   });
 
   test('changing host device and fixing mode changes header', function() {
     setPageContentData(
         settings.MultiDeviceSettingsMode.HOST_SET_VERIFIED, HOST_DEVICE);
-    assertEquals(getLabel(), HOST_DEVICE.name);
-    const anotherHost =
-        Object.assign(HOST_DEVICE, {name: 'Super Duper ' + HOST_DEVICE.name});
+    assertEquals(getLabel(), HOST_DEVICE);
+    const anotherHost = 'Super Duper ' + HOST_DEVICE;
     setPageContentData(
         settings.MultiDeviceSettingsMode.HOST_SET_VERIFIED, anotherHost);
-    assertEquals(getLabel(), anotherHost.name);
+    assertEquals(getLabel(), anotherHost);
   });
 
   test('item is actionable if and only if a host is set', function() {
-    setPageContentData(settings.MultiDeviceSettingsMode.NO_HOST_SET, null);
+    setPageContentData(settings.MultiDeviceSettingsMode.NO_HOST_SET, undefined);
     assertFalse(
         multidevicePage.$$('#multidevice-item').hasAttribute('actionable'));
     for (let mode of HOST_SET_MODES) {

chrome/test/data/webui/settings/multidevice_subpage_tests.js

@@ -8,14 +8,11 @@ suite('Multidevice', function() {
   // enum settings.MultiDeviceSettingsMode from here so its initialization is
   // deferred to the suiteSetup function.
   let HOST_SET_MODES;
-  const HOST_DEVICE = {
-    name: 'Pixel XL',
-  };
 
   function setPageContentData(newMode) {
     multideviceSubpage.pageContentData = {
       mode: newMode,
-      hostDevice: HOST_DEVICE,
+      hostDeviceName: 'Pixel XL',
     };
     Polymer.dom.flush();
   }