| 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/task_profiler/task_profiler_data_serializer.h" | 5 #include "chrome/browser/task_profiler/task_profiler_data_serializer.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/json/json_string_value_serializer.h" | 9 #include "base/json/json_string_value_serializer.h" |
| 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 11 #include "base/tracked_objects.h" | 12 #include "base/tracked_objects.h" |
| 12 #include "chrome/common/chrome_content_client.h" | 13 #include "chrome/common/chrome_content_client.h" |
| 13 #include "components/nacl/common/nacl_process_type.h" | 14 #include "components/nacl/common/nacl_process_type.h" |
| 14 #include "content/public/common/process_type.h" | 15 #include "content/public/common/process_type.h" |
| 15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 16 | 17 |
| 17 using base::DictionaryValue; | 18 using base::DictionaryValue; |
| 18 using base::ListValue; | 19 using base::ListValue; |
| 19 using base::Value; | 20 using base::Value; |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 tasks_list->Append(snapshot.release()); | 128 tasks_list->Append(snapshot.release()); |
| 128 } | 129 } |
| 129 dictionary->Set("list", tasks_list.release()); | 130 dictionary->Set("list", tasks_list.release()); |
| 130 | 131 |
| 131 dictionary->SetInteger("process_id", process_id); | 132 dictionary->SetInteger("process_id", process_id); |
| 132 dictionary->SetString("process_type", content::GetProcessTypeNameInEnglish( | 133 dictionary->SetString("process_type", content::GetProcessTypeNameInEnglish( |
| 133 AsChromeProcessType(process_type))); | 134 AsChromeProcessType(process_type))); |
| 134 } | 135 } |
| 135 | 136 |
| 136 } // namespace task_profiler | 137 } // namespace task_profiler |
| OLD | NEW |