| Index: runtime/observatory/lib/src/elements/flag_list.dart
 | 
| diff --git a/runtime/observatory/lib/src/elements/flag_list.dart b/runtime/observatory/lib/src/elements/flag_list.dart
 | 
| index f2d1cfc4a8ad697b82bc8672f1fad6eb91aa1710..19d78162e99a05c544137caab093c537a83cc2b4 100644
 | 
| --- a/runtime/observatory/lib/src/elements/flag_list.dart
 | 
| +++ b/runtime/observatory/lib/src/elements/flag_list.dart
 | 
| @@ -4,35 +4,148 @@
 | 
|  
 | 
|  library flag_list_element;
 | 
|  
 | 
| +import 'dart:html';
 | 
|  import 'dart:async';
 | 
| -import 'package:polymer/polymer.dart';
 | 
| -import 'observatory_element.dart';
 | 
| -import 'package:observatory/service.dart';
 | 
| -
 | 
| -@CustomTag('flag-list')
 | 
| -class FlagListElement extends ObservatoryElement {
 | 
| -  @published ServiceMap flagList;
 | 
| -
 | 
| -  void flagListChanged(oldValue) {
 | 
| -    modifiedFlags =
 | 
| -        flagList['flags'].where((flag) => flag['modified']).toList();
 | 
| -    unmodifiedFlags =
 | 
| -        flagList['flags'].where((flag) => !flag['modified']).toList();
 | 
| -  }
 | 
| +import 'package:observatory/models.dart' as M;
 | 
| +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/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';
 | 
| +import 'package:observatory/src/elements/nav/vm_menu.dart';
 | 
| +import 'package:observatory/src/elements/view_footer.dart';
 | 
| +
 | 
| +class FlagListElement extends HtmlElement implements Renderable {
 | 
| +  static const tag = const Tag<FlagListElement>('flag-list',
 | 
| +                     dependencies: const [NavBarElement.tag,
 | 
| +                                          NavMenuElement.tag,
 | 
| +                                          NavNotifyElement.tag,
 | 
| +                                          NavRefreshElement.tag,
 | 
| +                                          NavTopMenuElement.tag,
 | 
| +                                          NavVMMenuElement.tag,
 | 
| +                                          ViewFooterElement.tag,]);
 | 
| +
 | 
| +  RenderingScheduler _r;
 | 
| +
 | 
| +  Stream<RenderedEvent<FlagListElement>> get onRendered => _r.onRendered;
 | 
| +
 | 
| +  M.VMRef _vm;
 | 
| +  Stream<M.VMUpdateEvent> _vmUpdates;
 | 
| +  M.FlagsRepository _repository;
 | 
| +  M.NotificationRepository _notifications;
 | 
| +  Iterable<M.Flag> _flags;
 | 
|  
 | 
| -  @observable List<ServiceMap> modifiedFlags = new List<ServiceMap>();
 | 
| -  @observable List<ServiceMap> unmodifiedFlags = new List<ServiceMap>();
 | 
| +  M.VMRef get vm => _vm;
 | 
| +
 | 
| +  factory FlagListElement(M.VMRef vm,
 | 
| +                          Stream<M.VMUpdateEvent> vmUpdates,
 | 
| +                          M.FlagsRepository repository,
 | 
| +                          M.NotificationRepository notifications,
 | 
| +                          {RenderingQueue queue}) {
 | 
| +    assert(vm != null);
 | 
| +    assert(vmUpdates != null);
 | 
| +    assert(repository != null);
 | 
| +    assert(notifications != null);
 | 
| +    FlagListElement e = document.createElement(tag.name);
 | 
| +    e._r = new RenderingScheduler(e, queue: queue);
 | 
| +    e._vm = vm;
 | 
| +    e._vmUpdates = vmUpdates;
 | 
| +    e._repository = repository;
 | 
| +    e._notifications = notifications;
 | 
| +    return e;
 | 
| +  }
 | 
|  
 | 
|    FlagListElement.created() : super.created();
 | 
|  
 | 
| -  Future refresh() {
 | 
| -    return flagList.reload();
 | 
| +  @override
 | 
| +  void attached() {
 | 
| +    super.attached();
 | 
| +    _r.enable();
 | 
| +    _refresh();
 | 
| +  }
 | 
| +
 | 
| +  @override
 | 
| +  void detached() {
 | 
| +    super.detached();
 | 
| +    children = [];
 | 
| +    _r.disable(notify: true);
 | 
|    }
 | 
| -}
 | 
|  
 | 
| -@CustomTag('flag-item')
 | 
| -class FlagItemElement extends ObservatoryElement {
 | 
| -  @published ObservableMap flag;
 | 
| +  void render() {
 | 
| +    final content = <Element>[];
 | 
| +    if (_flags == null) {
 | 
| +      content.add(new HeadingElement.h1()..text = 'Loading Flags...');
 | 
| +    } else {
 | 
| +      final modified = _flags.where(_isModified);
 | 
| +      final unmodified = _flags.where(_isUnmodified);
 | 
|  
 | 
| -  FlagItemElement.created() : super.created();
 | 
| +      if (modified.isNotEmpty) {
 | 
| +        content.add(new HeadingElement.h1()..text = 'Modified Flags');
 | 
| +        content.add(new BRElement());
 | 
| +        content.addAll(modified.expand(_renderFlag));
 | 
| +        content.add(new HRElement());
 | 
| +      }
 | 
| +
 | 
| +      content.add(new HeadingElement.h1()..text = 'Unmodified Flags');
 | 
| +      content.add(new BRElement());
 | 
| +
 | 
| +      if (unmodified.isEmpty) {
 | 
| +        content.add(new HeadingElement.h2()..text = 'None');
 | 
| +      } else {
 | 
| +        content.addAll(unmodified.expand(_renderFlag));
 | 
| +      }
 | 
| +    }
 | 
| +
 | 
| +    children = [
 | 
| +      new NavBarElement(queue: _r.queue)
 | 
| +        ..children = [
 | 
| +          new NavTopMenuElement(queue: _r.queue),
 | 
| +          new NavVMMenuElement(_vm, _vmUpdates, queue: _r.queue),
 | 
| +          new NavMenuElement('flags', link: Uris.flags(), last: true,
 | 
| +                             queue: _r.queue),
 | 
| +          new NavRefreshElement(queue: _r.queue)
 | 
| +            ..onRefresh.listen((e) async {
 | 
| +              e.element.disabled = true;
 | 
| +              try {
 | 
| +                await _refresh();
 | 
| +              } finally {
 | 
| +                e.element.disabled = false;
 | 
| +              }
 | 
| +            }),
 | 
| +          new NavNotifyElement(_notifications, queue: _r.queue)
 | 
| +        ],
 | 
| +      new DivElement()
 | 
| +        ..classes = ['content-centered']
 | 
| +        ..children = content,
 | 
| +      new ViewFooterElement(queue: _r.queue)
 | 
| +    ];
 | 
| +  }
 | 
| +
 | 
| +  Future _refresh() async {
 | 
| +    _flags = await _repository.list(_vm);
 | 
| +    _r.dirty();
 | 
| +  }
 | 
| +
 | 
| +  static bool _isModified(M.Flag flag) => flag.modified;
 | 
| +  static bool _isUnmodified(M.Flag flag) => !flag.modified;
 | 
| +
 | 
| +  static List<Element> _renderFlag(M.Flag flag) {
 | 
| +    return [
 | 
| +      new SpanElement()..classes = const ['comment']
 | 
| +        ..text = '// ${flag.comment}',
 | 
| +      new DivElement()..classes = flag.modified ? const ['flag', 'modified']
 | 
| +                                                : const ['flag', 'unmodified']
 | 
| +        ..children = [
 | 
| +          new SpanElement()..classes = const ['name']
 | 
| +            ..text = flag.name,
 | 
| +          new SpanElement()..text = '=',
 | 
| +          new SpanElement()..classes = const ['value']
 | 
| +            ..text = flag.valueAsString ?? 'NULL'
 | 
| +        ],
 | 
| +      new BRElement(),
 | 
| +    ];
 | 
| +  }
 | 
|  }
 | 
| 
 |