diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/components/about_ui | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
| download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/about_ui')
| -rw-r--r-- | chromium/components/about_ui/OWNERS | 2 | ||||
| -rw-r--r-- | chromium/components/about_ui/PRESUBMIT.py | 25 | ||||
| -rw-r--r-- | chromium/components/about_ui/resources/about_credits.js | 18 | ||||
| -rw-r--r-- | chromium/components/about_ui/resources/about_credits.tmpl | 4 |
4 files changed, 46 insertions, 3 deletions
diff --git a/chromium/components/about_ui/OWNERS b/chromium/components/about_ui/OWNERS index e87625e132a..918baa1330f 100644 --- a/chromium/components/about_ui/OWNERS +++ b/chromium/components/about_ui/OWNERS @@ -1,3 +1,3 @@ -file://ui/webui/OWNERS +file://ui/webui/PLATFORM_OWNERS # COMPONENT: UI>Browser>WebUI diff --git a/chromium/components/about_ui/PRESUBMIT.py b/chromium/components/about_ui/PRESUBMIT.py new file mode 100644 index 00000000000..5b4c471b83b --- /dev/null +++ b/chromium/components/about_ui/PRESUBMIT.py @@ -0,0 +1,25 @@ +# Copyright 2017 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. + + +def _CommonChecks(input_api, output_api): + results = [] + try: + import sys + old_sys_path = sys.path[:] + cwd = input_api.PresubmitLocalPath() + sys.path += [input_api.os_path.join(cwd, '..', '..', 'tools')] + import web_dev_style.presubmit_support + results += web_dev_style.presubmit_support.CheckStyle(input_api, output_api) + finally: + sys.path = old_sys_path + return results + + +def CheckChangeOnUpload(input_api, output_api): + return _CommonChecks(input_api, output_api) + + +def CheckChangeOnCommit(input_api, output_api): + return _CommonChecks(input_api, output_api) diff --git a/chromium/components/about_ui/resources/about_credits.js b/chromium/components/about_ui/resources/about_credits.js index 818ef5e77b2..d01ffb68514 100644 --- a/chromium/components/about_ui/resources/about_credits.js +++ b/chromium/components/about_ui/resources/about_credits.js @@ -23,6 +23,24 @@ function toggle(o) { } document.addEventListener('DOMContentLoaded', function() { + var licenseEls = [].slice.call(document.getElementsByClassName('product')); + + licenseEls.sort(function(a, b) { + var nameA = a.getElementsByClassName('title')[0].textContent; + var nameB = b.getElementsByClassName('title')[0].textContent; + if (nameA < nameB) return -1; + if (nameA > nameB) return 1; + return 0; + }); + + var parentEl = licenseEls[0].parentNode; + parentEl.innerHTML = ''; + for (var i = 0; i < licenseEls.length; i++) { + parentEl.appendChild(licenseEls[i]); + } + + document.body.hidden = false; + if (cr.isChromeOS) { var keyboardUtils = document.createElement('script'); keyboardUtils.src = 'chrome://credits/keyboard_utils.js'; diff --git a/chromium/components/about_ui/resources/about_credits.tmpl b/chromium/components/about_ui/resources/about_credits.tmpl index e9f119d6777..fc4fc965ac9 100644 --- a/chromium/components/about_ui/resources/about_credits.tmpl +++ b/chromium/components/about_ui/resources/about_credits.tmpl @@ -59,7 +59,7 @@ body { } </style> </head> -<body> +<body hidden> <span class="page-title" style="float:left;">Credits</span> <a id="print-link" href="#" style="float:right;">Print</a> <div style="clear:both; overflow:auto;"><!-- Chromium <3s the following projects --> @@ -68,4 +68,4 @@ body { <script src="chrome://resources/js/cr.js"></script> <script src="chrome://credits/credits.js"></script> </body> -</html> +</html>
\ No newline at end of file |