Index: runtime/observatory/lib/src/elements/metrics.dart |
diff --git a/runtime/observatory/lib/src/elements/metrics.dart b/runtime/observatory/lib/src/elements/metrics.dart |
index 4426e5c695c9e7d9f67a75be64044eefabed3d7f..12a3ef641a9b48149a2123e7912696f84c7670c1 100644 |
--- a/runtime/observatory/lib/src/elements/metrics.dart |
+++ b/runtime/observatory/lib/src/elements/metrics.dart |
@@ -7,13 +7,13 @@ library metrics; |
import 'dart:async'; |
import 'dart:html'; |
import 'package:observatory/models.dart' as M; |
+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/metric/details.dart'; |
import 'package:observatory/src/elements/metric/graph.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 @@ class MetricsPageElement extends HtmlElement implements Renderable { |
dependencies: const [ |
MetricDetailsElement.tag, |
MetricGraphElement.tag, |
- NavBarElement.tag, |
NavTopMenuElement.tag, |
NavVMMenuElement.tag, |
NavIsolateMenuElement.tag, |
- NavMenuElement.tag, |
NavRefreshElement.tag, |
NavNotifyElement.tag, |
]); |
@@ -87,19 +85,18 @@ class MetricsPageElement extends HtmlElement implements Renderable { |
void render() { |
children = [ |
- 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('metrics', last: true, queue: _r.queue), |
- new NavRefreshElement(queue: _r.queue) |
- ..onRefresh.listen((e) { |
- e.element.disabled = true; |
- _refresh(); |
- }), |
- 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('metrics'), |
+ new NavRefreshElement(queue: _r.queue) |
+ ..onRefresh.listen((e) { |
+ e.element.disabled = true; |
+ _refresh(); |
+ }), |
+ new NavNotifyElement(_notifications, queue: _r.queue) |
+ ]), |
new DivElement()..classes = ['content-centered-big'] |
..children = [ |
new HeadingElement.h2()..text = 'Metrics', |