Index: runtime/observatory/lib/src/elements/cpu_profile.dart |
diff --git a/runtime/observatory/lib/src/elements/cpu_profile.dart b/runtime/observatory/lib/src/elements/cpu_profile.dart |
index 672f6d357ace0b4f0ac67e5b08b2769fd66002a8..606c81743d126c70ec7dd8886d9213cee5a3407c 100644 |
--- a/runtime/observatory/lib/src/elements/cpu_profile.dart |
+++ b/runtime/observatory/lib/src/elements/cpu_profile.dart |
@@ -8,12 +8,12 @@ import 'dart:async'; |
import 'dart:html'; |
import 'package:observatory/models.dart' as M; |
import 'package:observatory/src/elements/cpu_profile/virtual_tree.dart'; |
+import 'package:observatory/src/elements/helpers/nav_bar.dart'; |
+import 'package:observatory/src/elements/helpers/nav_menu.dart'; |
import 'package:observatory/src/elements/helpers/rendering_scheduler.dart'; |
import 'package:observatory/src/elements/helpers/tag.dart'; |
import 'package:observatory/src/elements/helpers/uris.dart'; |
-import 'package:observatory/src/elements/nav/bar.dart'; |
import 'package:observatory/src/elements/nav/isolate_menu.dart'; |
-import 'package:observatory/src/elements/nav/menu.dart'; |
import 'package:observatory/src/elements/nav/notify.dart'; |
import 'package:observatory/src/elements/nav/refresh.dart'; |
import 'package:observatory/src/elements/nav/top_menu.dart'; |
@@ -24,11 +24,9 @@ import 'package:observatory/src/elements/stack_trace_tree_config.dart'; |
class CpuProfileElement extends HtmlElement implements Renderable { |
static const tag = const Tag<CpuProfileElement>('cpu-profile', |
dependencies: const [ |
- NavBarElement.tag, |
NavTopMenuElement.tag, |
NavVMMenuElement.tag, |
NavIsolateMenuElement.tag, |
- NavMenuElement.tag, |
NavRefreshElement.tag, |
NavNotifyElement.tag, |
SampleBufferControlElement.tag, |
@@ -96,19 +94,17 @@ class CpuProfileElement extends HtmlElement implements Renderable { |
void render() { |
var content = [ |
- new NavBarElement(queue: _r.queue) |
- ..children = [ |
- new NavTopMenuElement(queue: _r.queue), |
- new NavVMMenuElement(_vm, _events, queue: _r.queue), |
- new NavIsolateMenuElement(_isolate, _events, queue: _r.queue), |
- new NavMenuElement('cpu profile', link: Uris.cpuProfiler(_isolate), |
- last: true, queue: _r.queue), |
- new NavRefreshElement(queue: _r.queue) |
- ..onRefresh.listen(_refresh), |
- new NavRefreshElement(label: 'Clear', queue: _r.queue) |
- ..onRefresh.listen(_clearCpuProfile), |
- new NavNotifyElement(_notifications, queue: _r.queue) |
- ], |
+ navBar([ |
+ new NavTopMenuElement(queue: _r.queue), |
+ new NavVMMenuElement(_vm, _events, queue: _r.queue), |
+ new NavIsolateMenuElement(_isolate, _events, queue: _r.queue), |
+ navMenu('cpu profile', link: Uris.cpuProfiler(_isolate)), |
+ new NavRefreshElement(queue: _r.queue) |
+ ..onRefresh.listen(_refresh), |
+ new NavRefreshElement(label: 'Clear', queue: _r.queue) |
+ ..onRefresh.listen(_clearCpuProfile), |
+ new NavNotifyElement(_notifications, queue: _r.queue) |
+ ]), |
]; |
if (_progress == null) { |
children = content; |