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

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

Index: chrome/browser/resources/settings/device_page/display.js
diff --git a/chrome/browser/resources/settings/device_page/display.js b/chrome/browser/resources/settings/device_page/display.js
index eb4e56053e5874be9e1338f0afccdaae3990c010..b8bf2e975d6e50413b3d698cfd0ba145b541e1f9 100644
--- a/chrome/browser/resources/settings/device_page/display.js
+++ b/chrome/browser/resources/settings/device_page/display.js
@@ -70,6 +70,20 @@ Polymer({
 
     /** @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. */
@@ -122,8 +136,11 @@ Polymer({
 
   /** @private */
   getDisplayInfo_: function() {
+    /** @type {chrome.system.display.GetInfoFlags} */ var flags = {
+      singleUnified: true
+    };
     settings.display.systemDisplayApi.getInfo(
-        this.displayInfoFetched_.bind(this));
+        flags, this.displayInfoFetched_.bind(this));
   },
 
   /**
@@ -240,17 +257,41 @@ Polymer({
    * @private
    */
   getDisplayMirrorText_: function(displays) {
-    return this.i18n(
-        this.isMirrored_(displays) ? 'displayMirrorOn' : 'displayMirrorOff');
+    return this.i18n(this.isMirrored_(displays) ? 'toggleOn' : 'toggleOff');
+  },
+
+  /**
+   * @param {boolean} unifiedDesktopAvailable
+   * @param {boolean} unifiedDesktopMode
+   * @param {!Array<!chrome.system.display.DisplayUnitInfo>} displays
+   * @return {boolean}
+   * @private
+   */
+  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 ? 'toggleOn' : 'toggleOff');
+  },
+
+  /**
+   * @param {boolean} unifiedDesktopMode
    * @param {!Array<!chrome.system.display.DisplayUnitInfo>} displays
    * @return {boolean}
    * @private
    */
-  showMirror_: function(displays) {
-    return this.isMirrored_(displays) || displays.length == 2;
+  showMirror_: function(unifiedDesktopMode, displays) {
+    return this.isMirrored_(displays) ||
+        (!unifiedDesktopMode && displays.length == 2);
   },
 
   /**
@@ -423,6 +464,16 @@ Polymer({
         id, properties, this.setPropertiesCallback_.bind(this));
   },
 
+  /** @private */
+  onUnifiedDesktopTap_: function() {
+    /** @type {!chrome.system.display.DisplayProperties} */ var properties = {
+      isUnified: !this.unifiedDesktopMode_,
+    };
+    settings.display.systemDisplayApi.setDisplayProperties(
+        this.primaryDisplayId, properties,
+        this.setPropertiesCallback_.bind(this));
+  },
+
   /**
    * @param {!Event} e
    * @private
@@ -454,6 +505,8 @@ Polymer({
         (this.displays && this.displays[0]);
     this.setSelectedDisplay_(selectedDisplay);
 
+    this.unifiedDesktopMode_ = !!primaryDisplay && primaryDisplay.isUnified;
+
     this.$.displayLayout.updateDisplays(this.displays, this.layouts);
   },