Chromium Code Reviews| Index: chrome/browser/ui/webui/profiler_ui.cc |
| diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc |
| index a8067f96cff5cafacb1d61966e6bc757a308220f..acaae146ed4e8be60a89571d6af958426fefb1e5 100644 |
| --- a/chrome/browser/ui/webui/profiler_ui.cc |
| +++ b/chrome/browser/ui/webui/profiler_ui.cc |
| @@ -163,13 +163,17 @@ void ProfilerUI::GetData() { |
| } |
| void ProfilerUI::ReceivedProfilerData( |
| - const tracked_objects::ProcessDataSnapshot& profiler_data, |
| - int process_type) { |
| + const tracked_objects::ProcessDataPhaseSnapshot& process_data_phase, |
| + int process_id, |
| + int process_type, |
| + int profiling_phase, |
| + const base::TimeDelta& profiling_phase_start, |
| + const base::TimeDelta& profiling_phase_finish, |
| + const metrics::ProfilerEventsSet& past_profiler_events) { |
| // Serialize the data to JSON. |
| base::DictionaryValue json_data; |
| - task_profiler::TaskProfilerDataSerializer::ToValue(profiler_data, |
| - process_type, |
| - &json_data); |
| + task_profiler::TaskProfilerDataSerializer::ToValue( |
| + process_data_phase, process_id, process_type, &json_data); |
|
Ilya Sherman
2015/03/10 00:48:10
Where are the corresponding changes to keep the ch
vadimt
2015/03/13 23:18:01
JS code already does merging of whatever it receiv
Ilya Sherman
2015/03/14 00:02:31
Sorry, I don't understand what you mean. Previous
vadimt
2015/03/14 01:39:15
Maybe, it wasn't necessary, but I checked (i.e. fe
|
| // Send the data to the renderer. |
| web_ui()->CallJavascriptFunction("g_browserBridge.receivedData", json_data); |