OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #include "content/browser/tracing/tracing_controller_impl.h" | 4 #include "content/browser/tracing/tracing_controller_impl.h" |
5 | 5 |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/cpu.h" | 7 #include "base/cpu.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/guid.h" | 9 #include "base/guid.h" |
10 #include "base/json/string_escape.h" | 10 #include "base/json/string_escape.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 NOTREACHED(); | 107 NOTREACHED(); |
108 return std::string(); | 108 return std::string(); |
109 } | 109 } |
110 | 110 |
111 std::unique_ptr<base::DictionaryValue> GenerateTracingMetadataDict() { | 111 std::unique_ptr<base::DictionaryValue> GenerateTracingMetadataDict() { |
112 std::unique_ptr<base::DictionaryValue> metadata_dict( | 112 std::unique_ptr<base::DictionaryValue> metadata_dict( |
113 new base::DictionaryValue()); | 113 new base::DictionaryValue()); |
114 | 114 |
115 metadata_dict->SetString("network-type", GetNetworkTypeString()); | 115 metadata_dict->SetString("network-type", GetNetworkTypeString()); |
116 metadata_dict->SetString("product-version", GetContentClient()->GetProduct()); | 116 metadata_dict->SetString("product-version", GetContentClient()->GetProduct()); |
| 117 metadata_dict->SetString("v8-version", GetContentClient()->GetV8Version()); |
117 metadata_dict->SetString("user-agent", GetContentClient()->GetUserAgent()); | 118 metadata_dict->SetString("user-agent", GetContentClient()->GetUserAgent()); |
118 | 119 |
119 // OS | 120 // OS |
120 metadata_dict->SetString("os-name", base::SysInfo::OperatingSystemName()); | 121 metadata_dict->SetString("os-name", base::SysInfo::OperatingSystemName()); |
121 metadata_dict->SetString("os-version", | 122 metadata_dict->SetString("os-version", |
122 base::SysInfo::OperatingSystemVersion()); | 123 base::SysInfo::OperatingSystemVersion()); |
123 metadata_dict->SetString("os-arch", | 124 metadata_dict->SetString("os-arch", |
124 base::SysInfo::OperatingSystemArchitecture()); | 125 base::SysInfo::OperatingSystemArchitecture()); |
125 | 126 |
126 // CPU | 127 // CPU |
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1077 // Schedule the next queued dump (if applicable). | 1078 // Schedule the next queued dump (if applicable). |
1078 if (!queued_memory_dump_requests_.empty()) { | 1079 if (!queued_memory_dump_requests_.empty()) { |
1079 BrowserThread::PostTask( | 1080 BrowserThread::PostTask( |
1080 BrowserThread::UI, FROM_HERE, | 1081 BrowserThread::UI, FROM_HERE, |
1081 base::Bind(&TracingControllerImpl::PerformNextQueuedGlobalMemoryDump, | 1082 base::Bind(&TracingControllerImpl::PerformNextQueuedGlobalMemoryDump, |
1082 base::Unretained(this))); | 1083 base::Unretained(this))); |
1083 } | 1084 } |
1084 } | 1085 } |
1085 | 1086 |
1086 } // namespace content | 1087 } // namespace content |
OLD | NEW |