OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_about_handler.h" | 5 #include "chrome/browser/browser_about_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 // sub-processes (i.e. renderers, plugins) used by Chrome. | 844 // sub-processes (i.e. renderers, plugins) used by Chrome. |
845 void AboutMemoryHandler::AppendProcess(ListValue* child_data, | 845 void AboutMemoryHandler::AppendProcess(ListValue* child_data, |
846 ProcessMemoryInformation* info) { | 846 ProcessMemoryInformation* info) { |
847 DCHECK(child_data && info); | 847 DCHECK(child_data && info); |
848 | 848 |
849 // Append a new DictionaryValue for this renderer to our list. | 849 // Append a new DictionaryValue for this renderer to our list. |
850 DictionaryValue* child = new DictionaryValue(); | 850 DictionaryValue* child = new DictionaryValue(); |
851 child_data->Append(child); | 851 child_data->Append(child); |
852 BindProcessMetrics(child, info); | 852 BindProcessMetrics(child, info); |
853 | 853 |
854 std::string child_label(ChildProcessInfo::GetTypeNameInEnglish(info->type)); | 854 std::string child_label( |
| 855 ChildProcessInfo::GetFullTypeNameInEnglish(info->type, |
| 856 info->renderer_type)); |
855 if (info->is_diagnostics) | 857 if (info->is_diagnostics) |
856 child_label.append(" (diagnostics)"); | 858 child_label.append(" (diagnostics)"); |
857 child->SetString("child_name", child_label); | 859 child->SetString("child_name", child_label); |
858 ListValue* titles = new ListValue(); | 860 ListValue* titles = new ListValue(); |
859 child->Set("titles", titles); | 861 child->Set("titles", titles); |
860 for (size_t i = 0; i < info->titles.size(); ++i) | 862 for (size_t i = 0; i < info->titles.size(); ++i) |
861 titles->Append(new StringValue(info->titles[i])); | 863 titles->Append(new StringValue(info->titles[i])); |
862 } | 864 } |
863 | 865 |
864 | 866 |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1114 // Run the dialog. This will re-use the existing one if it's already up. | 1116 // Run the dialog. This will re-use the existing one if it's already up. |
1115 AboutIPCDialog::RunDialog(); | 1117 AboutIPCDialog::RunDialog(); |
1116 return true; | 1118 return true; |
1117 } | 1119 } |
1118 #endif | 1120 #endif |
1119 | 1121 |
1120 #endif // OFFICIAL_BUILD | 1122 #endif // OFFICIAL_BUILD |
1121 | 1123 |
1122 return false; | 1124 return false; |
1123 } | 1125 } |
OLD | NEW |