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

Side by Side Diff: chrome/browser/resources/about_memory_linux.html

Issue 10796054: Adapt the linux about_memory page to better render on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use grd syntax for specifying android. Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/defaults.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 2
3 <!-- 3 <!--
4 about:memory template page 4 about:memory template page
5 --> 5 -->
6 <html id="t"> 6 <html id="t">
7 <head> 7 <head>
8 <title>About Memory</title> 8 <title>About Memory</title>
9 <link rel="stylesheet" href="shared/css/about_memory.css"> 9 <link rel="stylesheet" href="shared/css/about_memory.css">
10 <style> 10 <style>
11 body { 11 body {
12 font-family: Arial, Helvetica, sans-serif; 12 font-family: Arial, Helvetica, sans-serif;
13 <if expr="pp_ifdef('android')">
14 font-size: 22pt;
Evan Stade 2012/07/23 22:03:01 you should set the font-size on <body> like <body
Ted C 2012/07/23 22:18:00 I'm just overriding the values defined in about_me
Evan Stade 2012/07/23 22:44:27 it can be overridden by the page but usually we'd
Ted C 2012/07/24 20:51:50 The css file is shared across all platforms, so th
Evan Stade 2012/07/24 21:37:04 it's not your fault, but that is not a valid reaso
15 min-width: 30em;
16 </if>
13 } 17 }
14 div#header select { 18 div#header select {
15 font-family: Arial, Helvetica, sans-serif; 19 font-family: Arial, Helvetica, sans-serif;
16 } 20 }
17 div.otherbrowsers { 21 div.otherbrowsers {
18 font-family: Arial, Helvetica, sans-serif; 22 font-family: Arial, Helvetica, sans-serif;
19 } 23 }
20 table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(1), 24 table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(1),
21 table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(4), 25 table.list#browserComparison tr:not([class*='firstRow']) > *:nth-child(4),
22 table.list#browserComparison tr.firstRow th:nth-child(1) { 26 table.list#browserComparison tr.firstRow th:nth-child(1) {
(...skipping 17 matching lines...) Expand all
40 Measuring memory usage in a multi-process browser 44 Measuring memory usage in a multi-process browser
41 </p> 45 </p>
42 </div> 46 </div>
43 47
44 <div id='content'> 48 <div id='content'>
45 <h2> 49 <h2>
46 Summary 50 Summary
47 <div class='help'> 51 <div class='help'>
48 <div> 52 <div>
49 <p> 53 <p>
54 <if expr="not pp_ifdef('android')">
50 Summary of memory used by currently active browsers. 55 Summary of memory used by currently active browsers.
51 For browsers which use multiple processes, memory reflects 56 For browsers which use multiple processes, memory reflects
52 aggregate memory used across all browser processes.<p> 57 aggregate memory used across all browser processes.<p>
53 For Chromium, processes used to to display diagnostics 58 For Chromium, processes used to to display diagnostics
54 information (such as this "about:memory") are excluded. 59 information (such as this "about:memory") are excluded.
60 </if>
61 <if expr="pp_ifdef('android')">
62 Summary of memory used by Chromium. Since Chromium uses
Evan Stade 2012/07/23 22:03:01 why did you change the string? The difference seem
Ted C 2012/07/23 22:18:00 The main reason is that this was what we had in th
Evan Stade 2012/07/23 22:44:27 OK, now I understand the difference. Still, I thin
Ted C 2012/07/24 20:51:50 Done...but it's worth nothing that Chromium is use
63 multiple processes, memory reflects
64 aggregate memory used across all browser processes.<p>
65 For Chromium, processes used to display diagnostics
66 information (such as this "about:memory") are excluded.
67 </if>
55 </p> 68 </p>
56 </div> 69 </div>
57 </div> 70 </div>
58 </h2> 71 </h2>
59 72
60 <table class='list' id='browserComparison'> 73 <table class='list' id='browserComparison'>
61 <colgroup> 74 <colgroup>
62 <col class='name' /> 75 <col class='name' />
63 <col class='number' /> 76 <col class='number' />
64 <col class='number' /> 77 <col class='number' />
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 </td> 230 </td>
218 </tr> 231 </tr>
219 </table> 232 </table>
220 233
221 <div class="otherbrowsers">(The memory usage of our renderer processes is slightly less accurate when they are sandboxed.)</div> 234 <div class="otherbrowsers">(The memory usage of our renderer processes is slightly less accurate when they are sandboxed.)</div>
222 235
223 </div> 236 </div>
224 <script src="chrome://resources/js/jstemplate_compiled.js"></script> 237 <script src="chrome://resources/js/jstemplate_compiled.js"></script>
225 </body> 238 </body>
226 </html> 239 </html>
OLDNEW
« no previous file with comments | « chrome/browser/defaults.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698