| 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/ui/webui/profiler_ui.h" | 5 #include "chrome/browser/ui/webui/profiler_ui.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 // When testing the javacript code, it is cumbersome to have to keep | 9 // When testing the javacript code, it is cumbersome to have to keep |
| 10 // re-building the resouces package and reloading the browser. To solve | 10 // re-building the resouces package and reloading the browser. To solve |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 const metrics::ProfilerDataAttributes& attributes, | 166 const metrics::ProfilerDataAttributes& attributes, |
| 167 const tracked_objects::ProcessDataPhaseSnapshot& process_data_phase, | 167 const tracked_objects::ProcessDataPhaseSnapshot& process_data_phase, |
| 168 const metrics::ProfilerEvents& past_events) { | 168 const metrics::ProfilerEvents& past_events) { |
| 169 // Serialize the data to JSON. | 169 // Serialize the data to JSON. |
| 170 base::DictionaryValue json_data; | 170 base::DictionaryValue json_data; |
| 171 task_profiler::TaskProfilerDataSerializer::ToValue( | 171 task_profiler::TaskProfilerDataSerializer::ToValue( |
| 172 process_data_phase, attributes.process_id, attributes.process_type, | 172 process_data_phase, attributes.process_id, attributes.process_type, |
| 173 &json_data); | 173 &json_data); |
| 174 | 174 |
| 175 // Send the data to the renderer. | 175 // Send the data to the renderer. |
| 176 web_ui()->CallJavascriptFunction("g_browserBridge.receivedData", json_data); | 176 web_ui()->CallJavascriptFunctionUnsafe("g_browserBridge.receivedData", |
| 177 json_data); |
| 177 } | 178 } |
| OLD | NEW |