Index: runtime/observatory/lib/src/elements/persistent_handles.dart |
diff --git a/runtime/observatory/lib/src/elements/persistent_handles.dart b/runtime/observatory/lib/src/elements/persistent_handles.dart |
index e249ead875ddcc933ed4b22dccf79cdae0ed7dad..664916705223570b901bafbbda0a0fa0086ebd61 100644 |
--- a/runtime/observatory/lib/src/elements/persistent_handles.dart |
+++ b/runtime/observatory/lib/src/elements/persistent_handles.dart |
@@ -9,13 +9,13 @@ import 'dart:html'; |
import 'package:observatory/models.dart' as M; |
import 'package:observatory/src/elements/containers/virtual_collection.dart'; |
import 'package:observatory/src/elements/helpers/any_ref.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/instance_ref.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'; |
@@ -38,11 +38,9 @@ class PersistentHandlesPageElement extends HtmlElement implements Renderable { |
const Tag<PersistentHandlesPageElement>('persistent-handles-page', |
dependencies: const [ |
InstanceRefElement.tag, |
- NavBarElement.tag, |
NavTopMenuElement.tag, |
NavVMMenuElement.tag, |
NavIsolateMenuElement.tag, |
- NavMenuElement.tag, |
NavRefreshElement.tag, |
NavNotifyElement.tag, |
VirtualCollectionElement.tag |
@@ -110,17 +108,15 @@ class PersistentHandlesPageElement 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('persistent handles', last: true, |
- link: Uris.persistentHandles(_isolate), queue: _r.queue), |
- new NavRefreshElement(queue: _r.queue) |
- ..onRefresh.listen((_) => _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('persistent handles'), |
+ new NavRefreshElement(queue: _r.queue) |
+ ..onRefresh.listen((_) => _refresh()), |
+ new NavNotifyElement(_notifications, queue: _r.queue) |
+ ]) |
]..addAll(_createHandlers('Persistent Handles', |
_handles?.elements?.toList(), |
_createLine, |