diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-08 12:34:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-08 11:36:33 +0000 |
| commit | d702e4b6a64574e97fc7df8fe3238cde70242080 (patch) | |
| tree | 3297e13ad4560b4c4a0d23dcd32724ff6ac2e3fe /chromium/chrome/browser/resources | |
| parent | e6430e577f105ad8813c92e75c54660c4985026e (diff) | |
| download | qtwebengine-chromium-d702e4b6a64574e97fc7df8fe3238cde70242080.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.140
Change-Id: I646c933139007f1fdc42e7a4073652f8e6e55b5a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources')
| -rw-r--r-- | chromium/chrome/browser/resources/settings/device_page/night_light_slider.html | 8 | ||||
| -rw-r--r-- | chromium/chrome/browser/resources/settings/device_page/night_light_slider.js | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/chromium/chrome/browser/resources/settings/device_page/night_light_slider.html b/chromium/chrome/browser/resources/settings/device_page/night_light_slider.html index bd0db71050e..247f30fa4f7 100644 --- a/chromium/chrome/browser/resources/settings/device_page/night_light_slider.html +++ b/chromium/chrome/browser/resources/settings/device_page/night_light_slider.html @@ -1,15 +1,13 @@ -<html><head> <link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-behaviors/paper-inky-focus-behavior.html"> <link rel="import" href="../prefs/prefs_behavior.html"> -<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> -</head><body><dom-module id="night-light-slider"> + +<dom-module id="night-light-slider"> <template> <style> :host { cursor: default; - font-family: 'Roboto', sans-serif; text-align: center; user-select: none; } @@ -191,5 +189,5 @@ </div> </template> + <script src="night_light_slider.js"></script> </dom-module> -<script src="night_light_slider.js"></script></body></html>
\ No newline at end of file diff --git a/chromium/chrome/browser/resources/settings/device_page/night_light_slider.js b/chromium/chrome/browser/resources/settings/device_page/night_light_slider.js index d948ecbf936..84210288d1f 100644 --- a/chromium/chrome/browser/resources/settings/device_page/night_light_slider.js +++ b/chromium/chrome/browser/resources/settings/device_page/night_light_slider.js @@ -86,12 +86,6 @@ Polymer({ markersContainer.appendChild(marker); marker.style.left = (i * 100 / HOURS_PER_DAY) + '%'; } - - this.async(function() { - // Refresh the hour format as well as read the initial pref values and - // refresh the slider. - this.hourFormatChanged_(); - }); }, /** @@ -579,4 +573,4 @@ Polymer({ } }); -})();
\ No newline at end of file +})(); |