Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: content/browser/tracing/tracing_controller_impl.cc

Issue 2072383002: Trace revision and v8 version for IterationInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: specific_include_rules tracing_controller_impl.cc +v8 Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/tracing/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 12 matching lines...) Expand all
23 #include "content/common/child_process_messages.h" 23 #include "content/common/child_process_messages.h"
24 #include "content/public/browser/browser_message_filter.h" 24 #include "content/public/browser/browser_message_filter.h"
25 #include "content/public/browser/content_browser_client.h" 25 #include "content/public/browser/content_browser_client.h"
26 #include "content/public/browser/gpu_data_manager.h" 26 #include "content/public/browser/gpu_data_manager.h"
27 #include "content/public/browser/tracing_delegate.h" 27 #include "content/public/browser/tracing_delegate.h"
28 #include "content/public/common/child_process_host.h" 28 #include "content/public/common/child_process_host.h"
29 #include "content/public/common/content_client.h" 29 #include "content/public/common/content_client.h"
30 #include "content/public/common/content_switches.h" 30 #include "content/public/common/content_switches.h"
31 #include "gpu/config/gpu_info.h" 31 #include "gpu/config/gpu_info.h"
32 #include "net/base/network_change_notifier.h" 32 #include "net/base/network_change_notifier.h"
33 #include "v8/include/v8.h"
33 34
34 #if (defined(OS_POSIX) && defined(USE_UDEV)) || defined(OS_WIN) || \ 35 #if (defined(OS_POSIX) && defined(USE_UDEV)) || defined(OS_WIN) || \
35 defined(OS_MACOSX) 36 defined(OS_MACOSX)
36 #define ENABLE_POWER_TRACING 37 #define ENABLE_POWER_TRACING
37 #endif 38 #endif
38 39
39 #if defined(ENABLE_POWER_TRACING) 40 #if defined(ENABLE_POWER_TRACING)
40 #include "content/browser/tracing/power_tracing_agent.h" 41 #include "content/browser/tracing/power_tracing_agent.h"
41 #endif 42 #endif
42 43
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 NOTREACHED(); 108 NOTREACHED();
108 return std::string(); 109 return std::string();
109 } 110 }
110 111
111 std::unique_ptr<base::DictionaryValue> GenerateTracingMetadataDict() { 112 std::unique_ptr<base::DictionaryValue> GenerateTracingMetadataDict() {
112 std::unique_ptr<base::DictionaryValue> metadata_dict( 113 std::unique_ptr<base::DictionaryValue> metadata_dict(
113 new base::DictionaryValue()); 114 new base::DictionaryValue());
114 115
115 metadata_dict->SetString("network-type", GetNetworkTypeString()); 116 metadata_dict->SetString("network-type", GetNetworkTypeString());
116 metadata_dict->SetString("product-version", GetContentClient()->GetProduct()); 117 metadata_dict->SetString("product-version", GetContentClient()->GetProduct());
118 metadata_dict->SetString("v8-version", v8::V8::GetVersion());
117 metadata_dict->SetString("user-agent", GetContentClient()->GetUserAgent()); 119 metadata_dict->SetString("user-agent", GetContentClient()->GetUserAgent());
118 120
119 // OS 121 // OS
120 metadata_dict->SetString("os-name", base::SysInfo::OperatingSystemName()); 122 metadata_dict->SetString("os-name", base::SysInfo::OperatingSystemName());
121 metadata_dict->SetString("os-version", 123 metadata_dict->SetString("os-version",
122 base::SysInfo::OperatingSystemVersion()); 124 base::SysInfo::OperatingSystemVersion());
123 metadata_dict->SetString("os-arch", 125 metadata_dict->SetString("os-arch",
124 base::SysInfo::OperatingSystemArchitecture()); 126 base::SysInfo::OperatingSystemArchitecture());
125 127
126 // CPU 128 // CPU
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 // Schedule the next queued dump (if applicable). 1115 // Schedule the next queued dump (if applicable).
1114 if (!queued_memory_dump_requests_.empty()) { 1116 if (!queued_memory_dump_requests_.empty()) {
1115 BrowserThread::PostTask( 1117 BrowserThread::PostTask(
1116 BrowserThread::UI, FROM_HERE, 1118 BrowserThread::UI, FROM_HERE,
1117 base::Bind(&TracingControllerImpl::PerformNextQueuedGlobalMemoryDump, 1119 base::Bind(&TracingControllerImpl::PerformNextQueuedGlobalMemoryDump,
1118 base::Unretained(this))); 1120 base::Unretained(this)));
1119 } 1121 }
1120 } 1122 }
1121 1123
1122 } // namespace content 1124 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/tracing/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698