Use setMirrorMode in display settings

Changes:
Using system display api setDisplayProperties to turn on mirror mode is
deprecated. Replace the usage in display.js with the new api
setMirrorMode.

BUG=807825

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I86458ebf7aaa446d6ff23cde05c7eae819d11558
Reviewed-on: https://chromium-review.googlesource.com/896796
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534185}

chrome/browser/about_flags.cc

@@ -3670,7 +3670,7 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(network::switches::kLogNetLog)},
 
 #if defined(OS_CHROMEOS)
-    {"enable-multi-mirroring", flag_descriptions::kDisableMultiMirroringName,
+    {"disable-multi-mirroring", flag_descriptions::kDisableMultiMirroringName,
      flag_descriptions::kDisableMultiMirroringDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kDisableMultiMirroring)},
 #endif  // defined(OS_CHROMEOS)

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

@@ -699,25 +699,18 @@ Polymer({
     // Blur the control so that when the transition animation completes and the
     // UI is focused, the control does not receive focus. crbug.com/785070
     event.target.blur();
-    let id = '';
-    /** @type {!chrome.system.display.DisplayProperties} */
-    const properties = {};
-    if (this.isMirrored_(this.displays)) {
-      id = this.primaryDisplayId;
-      properties.mirroringSourceId = '';
-    } else {
-      // Set the mirroringSourceId of the secondary (first non-primary) display.
-      for (let i = 0; i < this.displays.length; ++i) {
-        const display = this.displays[i];
-        if (display.id != this.primaryDisplayId) {
-          id = display.id;
-          break;
-        }
-      }
-      properties.mirroringSourceId = this.primaryDisplayId;
-    }
-    settings.display.systemDisplayApi.setDisplayProperties(
-        id, properties, this.setPropertiesCallback_.bind(this));
+
+    /** @type {!chrome.system.display.MirrorModeInfo} */
+    let mirrorModeInfo = {
+      mode: this.isMirrored_(this.displays) ?
+          chrome.system.display.MirrorMode.OFF :
+          chrome.system.display.MirrorMode.NORMAL
+    };
+    settings.display.systemDisplayApi.setMirrorMode(mirrorModeInfo, () => {
+      let error = chrome.runtime.lastError;
+      if (error)
+        console.error('setMirrorMode Error: ' + error.message);
+    });
   },
 
   /** @private */

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

@@ -101,6 +101,23 @@ cr.define('settings', function() {
       callback();
     },
 
+    /** @override */
+    setMirrorMode(info, callback) {
+      let mirroringSourceId = '';
+      if (info.mode == chrome.system.display.MirrorMode.NORMAL) {
+        // Select the primary display as the mirroring source.
+        for (let d of this.fakeDisplays) {
+          if (d.isPrimary) {
+            mirroringSourceId = d.id;
+            break;
+          }
+        }
+      }
+      for (let d of this.fakeDisplays)
+        d.mirroringSourceId = mirroringSourceId;
+      callback();
+    },
+
     /** @override */
     onDisplayChanged: new FakeChromeEvent(),
 

extensions/common/api/system_display.idl

@@ -197,7 +197,7 @@ namespace system.display {
     // other properties may not apply. This is has no effect if not provided.
     boolean? isUnified;
 
-    // Depracated. Please use SetMirrorMode() instead.
+    // Deprecated. Please use setMirrorMode() instead.
     // Chrome OS only. If set and not empty, enables mirroring for this display.
     // Otherwise disables mirroring for this display. This value should indicate
     // the id of the source display to mirror, which must not be the same as the

third_party/closure_compiler/externs/system_display.js

@@ -159,6 +159,26 @@ chrome.system.display.DisplayProperties;
  */
 chrome.system.display.GetInfoFlags;
 
+/**
+ * @enum {string}
+ * @see https://developer.chrome.com/extensions/system.display#type-MirrorMode
+ */
+chrome.system.display.MirrorMode = {
+  OFF: 'off',
+  NORMAL: 'normal',
+  MIXED: 'mixed',
+};
+
+/**
+ * @typedef {{
+ *   mode: !chrome.system.display.MirrorMode,
+ *   mirroringSourceId: (string|undefined),
+ *   mirroringDestinationIds: (!Array<string>|undefined),
+ * }}
+ * @see https://developer.chrome.com/extensions/system.display#type-MirrorModeInfo
+ */
+chrome.system.display.MirrorModeInfo;
+
 /**
  * Requests the information for all attached display devices.
  * @param {!chrome.system.display.GetInfoFlags} flags Options affecting how the
@@ -301,6 +321,20 @@ chrome.system.display.completeCustomTouchCalibration = function(pairs, bounds) {
  */
 chrome.system.display.clearTouchCalibration = function(id) {};
 
+/**
+ * Sets the display mode to the specified mirror mode. Each call resets the
+ * state from previous calls. Calling setDisplayProperties() will fail for
+ * the mirroring destination displays.
+ * NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+ * @param {!chrome.system.display.MirrorModeInfo} info The information of the
+ *     mirror mode that should be applied to the display mode.
+ * @param {function():void=} callback Empty function called when the function
+ *     finishes. To find out     whether the function succeeded,
+ *     $(ref:runtime.lastError) should be     queried.
+ * @see https://developer.chrome.com/extensions/system.display#method-setMirrorMode
+ */
+chrome.system.display.setMirrorMode = function(info, callback) {};
+
 /**
  * Fired when anything changes to the display configuration.
  * @type {!ChromeEvent}