Index: runtime/observatory/lib/src/elements/icdata_view.dart |
diff --git a/runtime/observatory/lib/src/elements/icdata_view.dart b/runtime/observatory/lib/src/elements/icdata_view.dart |
index bd6676014c93b1c32a6e5bdf50cf85a24519b341..1d7cecd86cec377b098c0af807aa48440302db2d 100644 |
--- a/runtime/observatory/lib/src/elements/icdata_view.dart |
+++ b/runtime/observatory/lib/src/elements/icdata_view.dart |
@@ -7,11 +7,11 @@ import 'dart:html'; |
import 'package:observatory/models.dart' as M; |
import 'package:observatory/src/elements/curly_block.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/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'; |
@@ -23,11 +23,9 @@ class ICDataViewElement extends HtmlElement implements Renderable { |
static const tag = const Tag<ICDataViewElement>('icdata-view', |
dependencies: const [ |
CurlyBlockElement.tag, |
- NavBarElement.tag, |
NavTopMenuElement.tag, |
NavVMMenuElement.tag, |
NavIsolateMenuElement.tag, |
- NavMenuElement.tag, |
NavRefreshElement.tag, |
NavNotifyElement.tag, |
ObjectCommonElement.tag, |
@@ -110,12 +108,11 @@ class ICDataViewElement extends HtmlElement implements Renderable { |
void render() { |
children = [ |
- new NavBarElement(queue: _r.queue) |
- ..children = [ |
+ navBar([ |
new NavTopMenuElement(queue: _r.queue), |
new NavVMMenuElement(_vm, _events, queue: _r.queue), |
new NavIsolateMenuElement(_isolate, _events, queue: _r.queue), |
- new NavMenuElement('instance', last: true, queue: _r.queue), |
+ navMenu('instance'), |
new NavRefreshElement(queue: _r.queue) |
..onRefresh.listen((e) async { |
e.element.disabled = true; |
@@ -123,8 +120,7 @@ class ICDataViewElement extends HtmlElement implements Renderable { |
_r.dirty(); |
}), |
new NavNotifyElement(_notifications, queue: _r.queue) |
- ], |
- |
+ ]), |
new DivElement()..classes = ['content-centered-big'] |
..children = [ |
new HeadingElement.h2()..text = 'ICData', |