Determine the Win10-specific Welcome page variant to display

chrome/browser/resources/welcome/win10/inline.js

Index: chrome/browser/resources/welcome/win10/inline.js
diff --git a/chrome/browser/resources/welcome/win10/inline.js b/chrome/browser/resources/welcome/win10/inline.js
index 02555f6b616419d7f0c3a8e0c5a0f6a11b8db6b8..35c09807a19079d1d6d3afd31e3945f553092962 100644
--- a/chrome/browser/resources/welcome/win10/inline.js
+++ b/chrome/browser/resources/welcome/win10/inline.js
@@ -5,6 +5,12 @@
 cr.define('inline', function() {
   'use strict';
 
+  function computeClasses(isCombined) {
+    if (isCombined)
+      return 'section expandable expanded';
+    return 'section';
+  }
+
   function onContinue() {
     chrome.send('handleContinue');
   }
@@ -22,22 +28,40 @@ cr.define('inline', function() {
     }
   }
 
-  function computeClasses(isCombined) {
-    if (isCombined)
-      return 'section expandable expanded';
-    return 'section';
-  }
-
   function initialize() {
     var app = $('inline-app');
 
-    app.isCombined = window.location.href.includes('variant=combined');
+    // Set variables.
+    // Determines if the combined variant should be displayed. The combined
+    // variant includes instructions on how to pin Chrome to the taskbar.
+    app.isCombined = false;
 
     // Set handlers.
     app.computeClasses = computeClasses;
     app.onContinue = onContinue;
     app.onOpenSettings = onOpenSettings;
     app.onToggle = onToggle.bind(this, app);
+
+    // Asynchronously check if Chrome is pinned to the taskbar.
+    cr.sendWithPromise('getPinnedToTaskbarState').then(
+      function(isPinnedToTaskbar) {
+        // Allow overriding of the result via a query parameter.
+        // TODO(pmonette): Remove these checks when they are no longer needed.
+        /** @const */ var VARIANT_KEY = 'variant';
+        var VariantType = {
+          DEFAULT_ONLY: 'defaultonly',
+          COMBINED: 'combined'
+        };
+        var params = new URLSearchParams(location.search.slice(1));
+        if (params.has(VARIANT_KEY)) {
+          if (params.get(VARIANT_KEY) === VariantType.DEFAULT_ONLY)
+            app.isCombined = false;
+          else if (params.get(VARIANT_KEY) === VariantType.COMBINED)
+            app.isCombined = true;
+        } else {
+          app.isCombined = !isPinnedToTaskbar;
+        }
+      });
   }
 
   return {