Addressing UX regression on Win10 FRE, and changing timeout behavior

chrome/browser/resources/welcome/win10/inline.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.
 
 cr.define('inline', function() {
   'use strict';
 
   function computeClasses(isCombined) {
     if (isCombined)
       return 'section expandable expanded';
@@ skipping 16 matching lines @@
       });
     }
   }
 
   function initialize() {
     var app = $('inline-app');
 
     // 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;
+    app.isCombined = true;

[tommycli, 2017/02/27 23:17:22]

I guess I'm a bit confused as how changing this works? It appears that the value
is always overwritten when the 'getPinnedToTaskbarState' promise comes back..

[tmartino, 2017/02/28 00:08:53]

Whoops, that's a great catch--this is slightly complicated by the fact that
timing out that system check isn't really something you can intentionally repro
when testing.

The correct bool change is made in the cc file I've just uploaded.

 
     // 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) {
@@ skipping 15 matching lines @@
         }
       });
   }
 
   return {
     initialize: initialize
   };
 });
 
 document.addEventListener('DOMContentLoaded', inline.initialize);