diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-08 13:07:32 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-08 13:40:10 +0000 |
commit | 818d9aed569afd192f6d4f6d9b28b72912df8b93 (patch) | |
tree | fa30cbdffa3e8fdc09dbbe37ffc0a721b40fced1 /chromium/chrome/browser/resources/welcome/welcome_win10.js | |
parent | 66a2147d838e293f4a5db7711c8eba4e6faaaf0f (diff) | |
download | qtwebengine-chromium-818d9aed569afd192f6d4f6d9b28b72912df8b93.tar.gz |
BASELINE: Update Chromium to 65.0.3325.151
Change-Id: I3c71dd500483eb29491ac3eee4123714dda52da9
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/welcome/welcome_win10.js')
-rw-r--r-- | chromium/chrome/browser/resources/welcome/welcome_win10.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/chrome/browser/resources/welcome/welcome_win10.js b/chromium/chrome/browser/resources/welcome/welcome_win10.js index a961634a306..91a5bacbc42 100644 --- a/chromium/chrome/browser/resources/welcome/welcome_win10.js +++ b/chromium/chrome/browser/resources/welcome/welcome_win10.js @@ -31,18 +31,15 @@ Polymer({ ready: function() { this.isCombined = false; - this.isAccelerated = false; + this.isAccelerated = loadTimeData.getBoolean('accelerated_flow_enabled'); + // The accelerated flow can be overridden with a query parameter. const FLOWTYPE_KEY = 'flowtype'; const FLOW_TYPE_MAP = {'regular': false, 'accelerated': true}; var params = new URLSearchParams(location.search); if (params.has(FLOWTYPE_KEY)) { if (params.get(FLOWTYPE_KEY) in FLOW_TYPE_MAP) { this.isAccelerated = FLOW_TYPE_MAP[params.get(FLOWTYPE_KEY)]; - - // Adjust the height since the accelerated flow contains fewer steps. - this.customStyle['--expandable-section-height'] = '26.375em'; - this.updateStyles(); } else { console.log( 'Found invalid value for the \'flowtype\' parameter: %s', @@ -50,6 +47,10 @@ Polymer({ } } + // The accelerated flow contains fewer steps. To account for this, toggle + // the 'accelerated' class which reduces the height of the steps section. + this.classList.toggle('accelerated', this.isAccelerated); + // Asynchronously check if Chrome is pinned to the taskbar. cr.sendWithPromise('getPinnedToTaskbarState') .then(this.receivePinnedState_.bind(this)); |