| 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 #ifndef CHROME_BROWSER_MEMORY_DETAILS_H_ | 5 #ifndef CHROME_BROWSER_MEMORY_DETAILS_H_ |
| 6 #define CHROME_BROWSER_MEMORY_DETAILS_H_ | 6 #define CHROME_BROWSER_MEMORY_DETAILS_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // The working set information. | 52 // The working set information. |
| 53 base::WorkingSetKBytes working_set; | 53 base::WorkingSetKBytes working_set; |
| 54 // The committed bytes. | 54 // The committed bytes. |
| 55 base::CommittedKBytes committed; | 55 base::CommittedKBytes committed; |
| 56 // The process version | 56 // The process version |
| 57 base::string16 version; | 57 base::string16 version; |
| 58 // The process product name. | 58 // The process product name. |
| 59 base::string16 product_name; | 59 base::string16 product_name; |
| 60 // The number of processes which this memory represents. | 60 // The number of processes which this memory represents. |
| 61 int num_processes; | 61 int num_processes; |
| 62 // A process is a diagnostics process if it is rendering about:memory. | |
| 63 // Mark this specially so that it can avoid counting it in its own | |
| 64 // results. | |
| 65 bool is_diagnostics; | |
| 66 // If this is a child process of Chrome, what type (i.e. plugin) it is. | 62 // If this is a child process of Chrome, what type (i.e. plugin) it is. |
| 67 int process_type; | 63 int process_type; |
| 68 // If this is a renderer process, what type it is. | 64 // If this is a renderer process, what type it is. |
| 69 RendererProcessType renderer_type; | 65 RendererProcessType renderer_type; |
| 70 // A collection of titles used, i.e. for a tab it'll show all the page titles. | 66 // A collection of titles used, i.e. for a tab it'll show all the page titles. |
| 71 std::vector<base::string16> titles; | 67 std::vector<base::string16> titles; |
| 72 }; | 68 }; |
| 73 | 69 |
| 74 typedef std::vector<ProcessMemoryInformation> ProcessMemoryInformationList; | 70 typedef std::vector<ProcessMemoryInformation> ProcessMemoryInformationList; |
| 75 | 71 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 std::vector<ProcessData> process_data_; | 174 std::vector<ProcessData> process_data_; |
| 179 | 175 |
| 180 #if defined(OS_CHROMEOS) | 176 #if defined(OS_CHROMEOS) |
| 181 base::SwapInfo swap_info_; | 177 base::SwapInfo swap_info_; |
| 182 #endif | 178 #endif |
| 183 | 179 |
| 184 DISALLOW_COPY_AND_ASSIGN(MemoryDetails); | 180 DISALLOW_COPY_AND_ASSIGN(MemoryDetails); |
| 185 }; | 181 }; |
| 186 | 182 |
| 187 #endif // CHROME_BROWSER_MEMORY_DETAILS_H_ | 183 #endif // CHROME_BROWSER_MEMORY_DETAILS_H_ |
| OLD | NEW |