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

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

Issue 38533006: Add a note in chrome://memory for other browsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update notes Created 7 years, 1 month 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 | « no previous file | chrome/browser/resources/about_memory_linux.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/about_memory.html
diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 1f8a1095686bef8d4fc9f7ef8265cef39ba6b3c4..47446ae0db5a51ca19e0fdcd42852cbbcbe7f706 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -35,7 +35,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
<script src="chrome://memory-redirect/strings.js"></script>
</head>
<body>
- <div id='header'>
+ <div id="header">
<h1>
About memory
</h1>
@@ -44,10 +44,10 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
</p>
</div>
- <div id='content'>
+ <div id="content">
<h2>
Summary
- <div class='help'>
+ <div class="help">
<div>
<p>
Summary of memory used by currently active browsers. For browsers
@@ -63,21 +63,21 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
</div>
</h2>
- <table class='list' id='browserComparison'>
+ <table class="list" id="browserComparison">
<colgroup>
- <col class='name'>
- <col class='number'>
- <col class='number'>
- <col class='number'>
- <col class='number'>
- <col class='number'>
+ <col class="name">
+ <col class="number">
+ <col class="number">
+ <col class="number">
+ <col class="number">
+ <col class="number">
</colgroup>
- <tr class='firstRow doNotFilter'>
+ <tr class="firstRow doNotFilter">
<th>
</th>
- <th colspan='3'>
+ <th colspan="3">
Memory
- <div class='help'>
+ <div class="help">
<div>
<p>
<strong>Memory</strong>
@@ -106,9 +106,9 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
</div>
</div>
</th>
- <th colspan='2'>
+ <th colspan="2">
Virtual memory
- <div class='help'>
+ <div class="help">
<div>
<p>
<strong>Virtual memory</strong>
@@ -128,67 +128,70 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
</div>
</th>
</tr>
- <tr class='secondRow doNotFilter'>
- <th class='name'>
+ <tr class="secondRow doNotFilter">
+ <th class="name">
Browser
</th>
- <th class='name'>
+ <th class="name">
Private
</th>
- <th class='number'>
+ <th class="number">
Shared
</th>
- <th class='number'>
+ <th class="number">
Total
</th>
- <th class='number'>
+ <th class="number">
Private
</th>
- <th class='number'>
+ <th class="number">
Mapped
</th>
</tr>
<tr jsselect="browsers">
- <td class='name'>
+ <td class="name">
<div>
<strong jscontent="name"></strong>
<span jscontent="version"></span>
</div>
</td>
- <td class='number'>
- <span class='th'
+ <td class="number">
+ <span class="th"
jscontent="formatNumber(ws_priv + ws_shareable - ws_shared)">
- </span><span class='k'>k</span>
+ </span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jscontent="formatNumber(ws_shared / processes)">
- </span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" jscontent="formatNumber(ws_shared / processes)">
+ </span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th'
+ <td class="number">
+ <span class="th"
jscontent="formatNumber(ws_priv + ws_shareable - ws_shared +
- (ws_shared / processes))"></span><span class='k'>k</span>
+ (ws_shared / processes))"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jscontent="formatNumber(comm_priv)"></span>
- <span class='k'>k</span>
+ <td class="number">
+ <span class="th" jscontent="formatNumber(comm_priv)"></span>
+ <span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jscontent="formatNumber(comm_map)"></span>
- <span class='k'>k</span>
+ <td class="number">
+ <span class="th" jscontent="formatNumber(comm_map)"></span>
+ <span class="k">k</span>
</td>
</tr>
</table>
- <div class=otherbrowsers jsdisplay="browsers.length == 1">
- Note: If other browsers (e.g. IE, Firefox, Safari) are running,
- I'll show their memory details here.
+ <div class="otherbrowsers" jsdisplay="browsers.length == 1">
+ Note: This page will show memory use for all running browsers,
+ not just Chrome.
+ </div>
+ <div class="otherbrowsers" jsdisplay="browsers.length > 1">
+ Note: Chrome includes memory used by plug-ins, other browsers may not.
</div>
<br><br><br>
<h2>
Processes
- <div class='help'>
+ <div class="help">
<div>
<p>
Details of memory usage for each of
@@ -198,137 +201,137 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
</div>
</h2>
- <table class='list' id='memoryDetails'>
+ <table class="list" id="memoryDetails">
<colgroup>
- <col class='pid'>
- <col class='name'>
- <col class='number'>
- <col class='number'>
- <col class='number'>
- <col class='number'>
- <col class='number'>
+ <col class="pid">
+ <col class="name">
+ <col class="number">
+ <col class="number">
+ <col class="number">
+ <col class="number">
+ <col class="number">
</colgroup>
- <tr class='firstRow doNotFilter'>
+ <tr class="firstRow doNotFilter">
<th>
</th>
<th>
</th>
- <th colspan='3'>
+ <th colspan="3">
Memory
</th>
- <th colspan='2'>
+ <th colspan="2">
Virtual memory
</th>
</tr>
- <tr class='secondRow doNotFilter'>
- <th class='pid'>
+ <tr class="secondRow doNotFilter">
+ <th class="pid">
PID
</th>
- <th class='name'>
+ <th class="name">
Name
</th>
- <th class='number'>
+ <th class="number">
Private
</th>
- <th class='number'>
+ <th class="number">
Shared
</th>
- <th class='number'>
+ <th class="number">
Total
</th>
- <th class='number'>
+ <th class="number">
Private
</th>
- <th class='number'>
+ <th class="number">
Mapped
</th>
</tr>
<tr jsselect="browzr_data">
- <td class='pid'>
- <span class='th' jscontent="pid"></span>
+ <td class="pid">
+ <span class="th" jscontent="pid"></span>
</td>
- <td class='name'>
+ <td class="name">
<div>
Browser
</div>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_ws_priv', $this.ws_priv +
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_ws_priv', $this.ws_priv +
$this.ws_shareable - $this.ws_shared)" jscontent="ws_priv +
- ws_shareable - ws_shared"></span><span class='k'>k</span>
+ ws_shareable - ws_shared"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jscontent="ws_shared"></span>
- <span class='k'>k</span>
+ <td class="number">
+ <span class="th" jscontent="ws_shared"></span>
+ <span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_ws_tot', $this.ws_priv +
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_ws_tot', $this.ws_priv +
$this.ws_shareable)" jscontent="ws_priv +
- ws_shareable"></span><span class='k'>k</span>
+ ws_shareable"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_comm_priv', $this.comm_priv)"
- jscontent="comm_priv"></span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_comm_priv', $this.comm_priv)"
+ jscontent="comm_priv"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_comm_map', $this.comm_map)"
- jscontent="comm_map"></span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_comm_map', $this.comm_map)"
+ jscontent="comm_map"></span><span class="k">k</span>
</td>
</tr>
<tr jsselect="child_data">
- <td class='pid'>
- <span class='th' jscontent="pid"></span>
+ <td class="pid">
+ <span class="th" jscontent="pid"></span>
</td>
- <td class='name'>
+ <td class="name">
<div jscontent="child_name"></div>
<div jsselect="titles">
<span jscontent="$this"></span><br>
</div>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_ws_priv', $this.ws_priv +
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_ws_priv', $this.ws_priv +
$this.ws_shareable - $this.ws_shared)" jscontent="ws_priv +
- ws_shareable - ws_shared"></span><span class='k'>k</span>
+ ws_shareable - ws_shared"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jscontent="ws_shared"></span><span
- class='k'>k</span>
+ <td class="number">
+ <span class="th" jscontent="ws_shared"></span><span
+ class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_ws_tot', $this.ws_priv +
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_ws_tot', $this.ws_priv +
$this.ws_shareable)" jscontent="ws_priv +
- ws_shareable"></span><span class='k'>k</span>
+ ws_shareable"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_comm_priv', $this.comm_priv)"
- jscontent="comm_priv"></span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_comm_priv', $this.comm_priv)"
+ jscontent="comm_priv"></span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' jseval="addToSum('tot_comm_map', $this.comm_map)"
- jscontent="comm_map"></span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" jseval="addToSum('tot_comm_map', $this.comm_map)"
+ jscontent="comm_map"></span><span class="k">k</span>
</td>
</tr>
- <tr class='total doNotFilter'>
- <td class='pid'>
+ <tr class="total doNotFilter">
+ <td class="pid">
</td>
- <td class='name'>
+ <td class="name">
&Sigma;
</td>
- <td class='number'>
- <span class='th' id="tot_ws_priv">0</span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" id="tot_ws_priv">0</span><span class="k">k</span>
</td>
- <td class='number'>
+ <td class="number">
</td>
- <td class='number'>
- <span class='th' id="tot_ws_tot">0</span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" id="tot_ws_tot">0</span><span class="k">k</span>
</td>
- <td class='number'>
- <span class='th' id="tot_comm_priv">0</span><span class='k'>k</span>
+ <td class="number">
+ <span class="th" id="tot_comm_priv">0</span><span class="k">k</span>
</td>
- <td class='number'>
- <div class='help'>
+ <td class="number">
+ <div class="help">
<div>
<p>
This is an approximation. Conceptually, this is the total
@@ -339,12 +342,12 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) {
</p>
</div>
</div>
- <span class='th' id="tot_comm_map">0</span><span class='k'>k</span>
+ <span class="th" id="tot_comm_map">0</span><span class="k">k</span>
</td>
</tr>
- <tr class='noResults'>
- <td colspan='99'>
+ <tr class="noResults">
+ <td colspan="99">
No results found.
</td>
</tr>
« no previous file with comments | « no previous file | chrome/browser/resources/about_memory_linux.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698