MD Settings: Display: Add unified desktop control and modify api

chrome/browser/resources/settings/device_page/display.js

 // Copyright 2016 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.
 
 /**
  * @fileoverview
  * 'settings-display' is the settings subpage for display settings.
  */
 
 cr.define('settings.display', function() {
@@ skipping 52 matching lines @@
     selectedDisplay: Object,
 
     /** Id passed to the overscan dialog. */
     overscanDisplayId: {
       type: String,
       notify: true,
     },
 
     /** @private {!Array<number>} Mode index values for slider. */
     modeValues_: Array,
+
+    /** @private */
+    unifiedDesktopAvailable_: {
+      type: Boolean,
+      value: function() {
+        return loadTimeData.getBoolean('unifiedDesktopAvailable');
+      }
+    },
+
+    /** @private */
+    unifiedDesktopMode_: {
+      type: Boolean,
+      value: false,
+    },
   },
 
   /** @private {number} Selected mode index received from chrome. */
   currentSelectedModeIndex_: -1,
 
   /**
    * Listener for chrome.system.display.onDisplayChanged events.
    * @type {function(void)|undefined}
    * @private
    */
@@ skipping 155 matching lines @@
    * @param {!Array<!chrome.system.display.DisplayUnitInfo>} displays
    * @return {string} i18n string for mirroring settings text.
    * @private
    */
   getDisplayMirrorText_: function(displays) {
     return this.i18n(
         this.isMirrored_(displays) ? 'displayMirrorOn' : 'displayMirrorOff');
   },
 
   /**
+   * @param {boolean} unifiedDesktopAvailable
+   * @param {boolean} unifiedDesktopMode
    * @param {!Array<!chrome.system.display.DisplayUnitInfo>} displays
    * @return {boolean}
    * @private
    */
-  showMirror_: function(displays) {
+  showUnifiedDesktop_: function(
+      unifiedDesktopAvailable, unifiedDesktopMode, displays) {
+    return unifiedDesktopMode ||
+        (unifiedDesktopAvailable && displays.length > 1 &&
+         !this.isMirrored_(displays));
+  },
+
+  /**
+   * @param {boolean} unifiedDesktopMode
+   * @return {string}
+   * @private
+   */
+  getUnifiedDesktopText_: function(unifiedDesktopMode) {
+    return this.i18n(
+        unifiedDesktopMode ? 'displayMirrorOn' : 'displayMirrorOff');

[malaykeshav, 2017/04/05 23:02:57]

Shouldn't they have a string of their own?
i18n probably needs a context for unified desktop that is different from display
mirror.

[stevenjb, 2017/04/06 01:56:08]

Actually, we should use the more generic phase that we have since added for
toggles for both. If/when that becomes an issue we can create specific terms.

+  },
+
+  /**
+   * @param {boolean} unifiedDesktopMode
+   * @param {!Array<!chrome.system.display.DisplayUnitInfo>} displays
+   * @return {boolean}
+   * @private
+   */
+  showMirror_: function(unifiedDesktopMode, displays) {

[malaykeshav, 2017/04/05 23:02:57]

'unifiedDesktopMode' unused?

[stevenjb, 2017/04/06 01:56:08]

Oops, it should be, thanks for catching. Done.

     return this.isMirrored_(displays) || displays.length == 2;
   },
 
   /**
    * @param {!Array<!chrome.system.display.DisplayUnitInfo>} displays
    * @return {boolean}
    * @private
    */
   isMirrored_: function(displays) {
     return displays.length > 0 && !!displays[0].mirroringSourceId;
@@ skipping 153 matching lines @@
           id = display.id;
           break;
         }
       }
       properties.mirroringSourceId = this.primaryDisplayId;
     }
     settings.display.systemDisplayApi.setDisplayProperties(
         id, properties, this.setPropertiesCallback_.bind(this));
   },
 
+  /** @private */
+  onUnifiedDesktopTap_: function() {
+    settings.display.systemDisplayApi.enableUnifiedDesktop(
+        !this.unifiedDesktopMode_);
+  },
+
   /**
    * @param {!Event} e
    * @private
    */
   onOverscanTap_: function(e) {
     e.preventDefault();
     this.overscanDisplayId = this.selectedDisplay.id;
     this.showOverscanDialog_(true);
   },
 
@@ skipping 11 matching lines @@
         primaryDisplay = display;
       if (this.selectedDisplay && display.id == this.selectedDisplay.id)
         selectedDisplay = display;
     }
     this.displayIds = displayIds;
     this.primaryDisplayId = (primaryDisplay && primaryDisplay.id) || '';
     selectedDisplay = selectedDisplay || primaryDisplay ||
         (this.displays && this.displays[0]);
     this.setSelectedDisplay_(selectedDisplay);
 
+    this.unifiedDesktopMode_ = primaryDisplay && primaryDisplay.isUnified;
+
     this.$.displayLayout.updateDisplays(this.displays, this.layouts);
   },
 
   /** @private */
   setPropertiesCallback_: function() {
     if (chrome.runtime.lastError) {
       console.error(
           'setDisplayProperties Error: ' + chrome.runtime.lastError.message);
     }
   },
 });