OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/html_viewer/stats_collection_controller.h" | 5 #include "components/html_viewer/stats_collection_controller.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 } | 75 } |
76 | 76 |
77 v8::Isolate* isolate = blink::mainThreadIsolate(); | 77 v8::Isolate* isolate = blink::mainThreadIsolate(); |
78 v8::HandleScope handle_scope(isolate); | 78 v8::HandleScope handle_scope(isolate); |
79 v8::Local<v8::Context> context = frame->mainWorldScriptContext(); | 79 v8::Local<v8::Context> context = frame->mainWorldScriptContext(); |
80 if (context.IsEmpty()) | 80 if (context.IsEmpty()) |
81 return nullptr; | 81 return nullptr; |
82 | 82 |
83 v8::Context::Scope context_scope(context); | 83 v8::Context::Scope context_scope(context); |
84 | 84 |
85 scoped_ptr<mojo::ApplicationConnection> connection = | 85 scoped_ptr<mojo::Connection> connection = |
86 shell->ConnectToApplication("mojo:tracing"); | 86 shell->ConnectToApplication("mojo:tracing"); |
87 if (!connection) | 87 if (!connection) |
88 return nullptr; | 88 return nullptr; |
89 tracing::StartupPerformanceDataCollectorPtr collector_for_controller; | 89 tracing::StartupPerformanceDataCollectorPtr collector_for_controller; |
90 tracing::StartupPerformanceDataCollectorPtr collector_for_caller; | 90 tracing::StartupPerformanceDataCollectorPtr collector_for_caller; |
91 connection->ConnectToService(&collector_for_controller); | 91 connection->ConnectToService(&collector_for_controller); |
92 connection->ConnectToService(&collector_for_caller); | 92 connection->ConnectToService(&collector_for_caller); |
93 | 93 |
94 gin::Handle<StatsCollectionController> controller = gin::CreateHandle( | 94 gin::Handle<StatsCollectionController> controller = gin::CreateHandle( |
95 isolate, | 95 isolate, |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 histogram->WriteJSON(&histogram_json); | 153 histogram->WriteJSON(&histogram_json); |
154 return histogram_json; | 154 return histogram_json; |
155 } | 155 } |
156 | 156 |
157 std::string StatsCollectionController::GetBrowserHistogram( | 157 std::string StatsCollectionController::GetBrowserHistogram( |
158 const std::string& histogram_name) { | 158 const std::string& histogram_name) { |
159 return GetHistogram(histogram_name); | 159 return GetHistogram(histogram_name); |
160 } | 160 } |
161 | 161 |
162 } // namespace html_viewer | 162 } // namespace html_viewer |
OLD | NEW |