OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/about_ui.h" | 5 #include "chrome/browser/ui/webui/about_ui.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
373 "Cached", base::IntToString(meminfo.cached / 1024))); | 373 "Cached", base::IntToString(meminfo.cached / 1024))); |
374 output.append(AddStringRow( | 374 output.append(AddStringRow( |
375 "Committed", base::IntToString( | 375 "Committed", base::IntToString( |
376 (meminfo.total - meminfo.free - meminfo.buffers - meminfo.cached) / 1024))); | 376 (meminfo.total - meminfo.free - meminfo.buffers - meminfo.cached) / 1024))); |
377 output.append(AddStringRow( | 377 output.append(AddStringRow( |
378 "Active Anon", base::IntToString(meminfo.active_anon / 1024))); | 378 "Active Anon", base::IntToString(meminfo.active_anon / 1024))); |
379 output.append(AddStringRow( | 379 output.append(AddStringRow( |
380 "Inactive Anon", base::IntToString(meminfo.inactive_anon / 1024))); | 380 "Inactive Anon", base::IntToString(meminfo.inactive_anon / 1024))); |
381 output.append(AddStringRow( | 381 output.append(AddStringRow( |
382 "Shared", base::IntToString(meminfo.shmem / 1024))); | 382 "Shared", base::IntToString(meminfo.shmem / 1024))); |
383 if (meminfo.gem_size != -1) { | |
384 output.append(AddStringRow( | |
DaveMoore
2012/12/07 18:52:48
Is this automatically added to a total? If so ther
James Cook
2012/12/07 19:41:22
It's not adding to any other totals in the UI. The
| |
385 "Graphics", base::IntToString(meminfo.gem_size / 1024 / 1024))); | |
386 } | |
383 output.append("</table>"); | 387 output.append("</table>"); |
384 | 388 |
385 AppendFooter(&output); | 389 AppendFooter(&output); |
386 return output; | 390 return output; |
387 } | 391 } |
388 | 392 |
389 #endif // OS_CHROMEOS | 393 #endif // OS_CHROMEOS |
390 | 394 |
391 #if defined(USE_ASH) | 395 #if defined(USE_ASH) |
392 | 396 |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1029 ThemeSource* theme = new ThemeSource(profile); | 1033 ThemeSource* theme = new ThemeSource(profile); |
1030 ChromeURLDataManager::AddDataSource(profile, theme); | 1034 ChromeURLDataManager::AddDataSource(profile, theme); |
1031 #endif | 1035 #endif |
1032 | 1036 |
1033 ChromeURLDataManager::DataSource* source = | 1037 ChromeURLDataManager::DataSource* source = |
1034 new AboutUIHTMLSource(name, profile); | 1038 new AboutUIHTMLSource(name, profile); |
1035 if (source) { | 1039 if (source) { |
1036 ChromeURLDataManager::AddDataSource(profile, source); | 1040 ChromeURLDataManager::AddDataSource(profile, source); |
1037 } | 1041 } |
1038 } | 1042 } |
OLD | NEW |