Chromium Code Reviews| Index: runtime/observatory/lib/src/elements/nav/isolate_menu_wrapper.dart |
| diff --git a/runtime/observatory/lib/src/elements/nav/isolate_menu_wrapper.dart b/runtime/observatory/lib/src/elements/nav/isolate_menu_wrapper.dart |
| index 3af85d2576ed61b3180a915ee6f46171588059ea..0857dd455a21bf3165665a49b8a75791fcc0ba57 100644 |
| --- a/runtime/observatory/lib/src/elements/nav/isolate_menu_wrapper.dart |
| +++ b/runtime/observatory/lib/src/elements/nav/isolate_menu_wrapper.dart |
| @@ -3,12 +3,9 @@ |
| // BSD-style license that can be found in the LICENSE file. |
| import 'dart:html'; |
| -import 'dart:async'; |
| import 'package:observatory/app.dart'; |
| import 'package:observatory/service.dart'; |
| -import 'package:observatory/mocks.dart'; |
| -import 'package:observatory/models.dart' as M; |
| import 'package:observatory/src/elements/helpers/tag.dart'; |
| import 'package:observatory/src/elements/shims/binding.dart'; |
| import 'package:observatory/src/elements/nav/isolate_menu.dart'; |
| @@ -22,11 +19,6 @@ class NavIsolateMenuElementWrapper extends HtmlElement { |
| static const tag = |
| const Tag<NavIsolateMenuElementWrapper>('isolate-nav-menu'); |
| - final StreamController<M.IsolateUpdateEvent> _updatesController = |
| - new StreamController<M.IsolateUpdateEvent>(); |
| - Stream<M.IsolateUpdateEvent> _updates; |
| - StreamSubscription _subscription; |
| - |
| bool _last = false; |
| Isolate _isolate; |
| bool get last => _last; |
| @@ -35,11 +27,10 @@ class NavIsolateMenuElementWrapper extends HtmlElement { |
| _last = value; render(); |
|
turnidge
2016/08/04 18:16:36
Our style is to put one statement per line.
cbernaschina
2016/08/04 21:00:20
Done.
|
| } |
| set isolate(Isolate value) { |
| - _isolate = value; _detached(); _attached(); |
| + _isolate = value; render(); |
|
turnidge
2016/08/04 18:16:36
One stmt per line.
cbernaschina
2016/08/04 21:00:20
Done.
|
| } |
| NavIsolateMenuElementWrapper.created() : super.created() { |
| - _updates = _updatesController.stream.asBroadcastStream(); |
| binder.registerCallback(this); |
| _last = _getBoolAttribute('last'); |
| createShadowRoot(); |
| @@ -49,42 +40,22 @@ class NavIsolateMenuElementWrapper extends HtmlElement { |
| @override |
| void attached() { |
| super.attached(); |
| - _attached(); |
| - } |
| - |
| - @override |
| - void detached() { |
| - super.detached(); |
| - _detached(); |
| - } |
| - |
| - void _attached() { |
| - if (_isolate != null) { |
| - _subscription = _isolate.changes.listen((_) { |
| - _updatesController.add(new IsolateUpdateEventMock(isolate: isolate)); |
| - }); |
| - } |
| render(); |
| } |
| - void _detached() { |
| - if (_subscription != null) { |
| - _subscription.cancel(); |
| - _subscription = null; |
| - } |
| - } |
| - |
| void render() { |
| shadowRoot.children = []; |
| if (_isolate == null || _last == null) return; |
|
turnidge
2016/08/04 18:16:36
Our style is:
if () {
return;
}
cbernaschina
2016/08/04 21:00:20
Done.
|
| shadowRoot.children = [ |
| - new NavIsolateMenuElement(isolate, _updates, last: last, |
| - queue: ObservatoryApplication.app.queue) |
| + new NavIsolateMenuElement(_isolate, app.events, last: _last, |
| + queue: app.queue) |
| ..children = [new ContentElement()] |
| ]; |
| } |
| + ObservatoryApplication get app => ObservatoryApplication.app; |
| + |
| bool _getBoolAttribute(String name) { |
| final String value = getAttribute(name); |
| return !(value == null || value == 'false'); |