Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2460)

Unified Diff: chrome/browser/resources/about_memory.html

Issue 7215034: Apply CSP to chrome: and about: pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/about_credits_entry.tmpl ('k') | chrome/browser/resources/about_memory.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/about_memory.html
===================================================================
--- chrome/browser/resources/about_memory.html (revision 90431)
+++ chrome/browser/resources/about_memory.html (working copy)
@@ -4,10 +4,10 @@
about:memory template page
-->
<html id="t">
- <head>
- <title>About Memory</title>
+<head>
+ <title>About Memory</title>
+ <meta http-equiv="X-WebKit-CSP" content="object-src 'none'; script-src chrome://resources 'self' 'unsafe-eval'">
<link rel="stylesheet" href="shared/css/about_memory.css">
-
<style>
body {
font-family: Helvetica, Arial, sans-serif;
@@ -34,79 +34,8 @@
border-right: 1px solid #b5c6de;
}
</style>
-<script>
-function reload() {
- if (document.getElementById('helpTooltip'))
- return;
- history.go(0);
-}
-
-function formatNumber(str) {
- str += '';
- if (str == '0') {
- return 'N/A ';
- }
- var x = str.split('.');
- var x1 = x[0];
- var x2 = x.length > 1 ? '.' + x[1] : '';
- var regex = /(\d+)(\d{3})/;
- while (regex.test(x1)) {
- x1 = x1.replace(regex, '$1' + ',' + '$2');
- }
- return x1;
-}
-
-function addToSum(id, value) {
- var target = document.getElementById(id);
- var sum = parseInt(target.innerHTML);
- sum += parseInt(value);
- target.innerHTML = sum;
-}
-
-function handleHelpTooltipMouseOver(event) {
- var el = document.createElement('div');
- el.id = 'helpTooltip';
- el.innerHTML = event.toElement.getElementsByTagName('div')[0].innerHTML;
- el.style.top = 0;
- el.style.left = 0;
- el.style.visibility = 'hidden';
- document.body.appendChild(el);
-
- var width = el.offsetWidth;
- var height = el.offsetHeight;
-
- if (event.pageX - width - 50 + document.body.scrollLeft >= 0 ) {
- el.style.left = (event.pageX - width - 20) + 'px';
- } else {
- el.style.left = (event.pageX + 20) + 'px';
- }
-
-
- if (event.pageY - height - 50 + document.body.scrollTop >= 0) {
- el.style.top = (event.pageY - height - 20) + 'px';
- } else {
- el.style.top = (event.pageY + 20) + 'px';
- }
-
- el.style.visibility = 'visible';
-}
-
-function handleHelpTooltipMouseOut(event) {
- var el = document.getElementById('helpTooltip');
- el.parentNode.removeChild(el);
-}
-
-function enableHelpTooltips() {
- var helpEls = document.getElementsByClassName('help');
-
- for (var i = 0, helpEl; helpEl = helpEls[i]; i++) {
- helpEl.onmouseover = handleHelpTooltipMouseOver;
- helpEl.onmouseout = handleHelpTooltipMouseOut;
- }
-}
-
-//setInterval("reload()", 10000);
-</script>
+<script src="chrome://memory-redirect/memory.js"></script>
+<script src="chrome://memory-redirect/strings.js"></script>
</head>
<body>
<div id='header'>
@@ -424,8 +353,6 @@
</tr>
</table>
</div>
+ <script src="chrome://resources/js/jstemplate_compiled.js"></script>
</body>
-<script>
- enableHelpTooltips();
-</script>
</html>
« no previous file with comments | « chrome/browser/resources/about_credits_entry.tmpl ('k') | chrome/browser/resources/about_memory.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698