Rework how types work in the VM Service.

runtime/bin/vmservice/observatory/lib/src/elements/service_view.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library service_object_view_element;
 
 import 'dart:html';
 import 'package:logging/logging.dart';
 import 'package:observatory/service.dart';
 import 'package:observatory/tracer.dart';
 import 'package:observatory/elements.dart';
 import 'package:polymer/polymer.dart';
 import 'observatory_element.dart';
 
 @CustomTag('service-view')
 class ServiceObjectViewElement extends ObservatoryElement {
   @published ServiceObject object;
   @published ObservableMap args;
 
   ServiceObjectViewElement.created() : super.created();
 
   ObservatoryElement _constructElementForObject() {
-    var type = object.vmType;
+    var type = object.type;
     switch (type) {
       case 'AllocationProfile':
         HeapProfileElement element = new Element.tag('heap-profile');
         element.profile = object;
         return element;
       case 'BreakpointList':
         BreakpointListElement element = new Element.tag('breakpoint-list');
         element.msg = object;
         return element;
       case 'Class':
@@ skipping 21 matching lines @@
         element.flagList = object;
         return element;
       case 'Function':
         FunctionViewElement element = new Element.tag('function-view');
         element.function = object;
         return element;
       case 'HeapMap':
         HeapMapElement element = new Element.tag('heap-map');
         element.fragmentation = object;
         return element;
-      case 'LibraryPrefix':
-      case 'TypeRef':
-      case 'TypeParameter':
-      case 'BoundedType':
-      case 'Int32x4':
-      case 'Float32x4':
-      case 'Float64x4':
-      case 'TypedData':
-      case 'ExternalTypedData':
-      case 'Capability':
-      case 'ReceivePort':
-      case 'SendPort':
-      case 'Stacktrace':
-      case 'JSRegExp':
-      case 'UserTag':
-        // TODO(turnidge): The types above this comment are instance
-        // types and should be handled by the InstanceViewElement.  We
-        // need to go through these and make sure that they print in a
-        // reasonable way.
-      case 'Type':
-      case 'Array':
-      case 'Bool':
-      case 'Closure':
-      case 'Double':
-      case 'GrowableObjectArray':
-      case 'Instance':
-      case 'Smi':
-      case 'Mint':
-      case 'MirrorReference':
-      case 'Null':
-      case 'Bigint':
-      case 'String':
-      case 'WeakProperty':
-        InstanceViewElement element = new Element.tag('instance-view');
-        element.instance = object;
-        return element;
       case 'IO':
         IOViewElement element = new Element.tag('io-view');
         element.io = object;
         return element;
       case 'HttpServerList':
         IOHttpServerListViewElement element =
             new Element.tag('io-http-server-list-view');
         element.list = object;
         return element;
       case 'HttpServer':
@@ skipping 71 matching lines @@
         return element;
       case 'StackTrace':
         StackTraceElement element = new Element.tag('stack-trace');
         element.trace = object;
         return element;
       case 'VM':
         VMViewElement element = new Element.tag('vm-view');
         element.vm = object;
         return element;
       default:
-        JsonViewElement element = new Element.tag('json-view');
-        element.map = object;
-        return element;
+        if (object.isInstance ||
+            object.isSentinel) {  // TODO(rmacnak): Separate this out.
+          InstanceViewElement element = new Element.tag('instance-view');
+          element.instance = object;
+          return element;
+        } else {
+          JsonViewElement element = new Element.tag('json-view');
+          element.map = object;
+          return element;
+        }
     }
   }
 
   objectChanged(oldValue) {
     // Remove the current view.
     children.clear();
     if (object == null) {
       Logger.root.info('Viewing null object.');
       return;
     }
@@ skipping 54 matching lines @@
 
   dynamic expander() {
     return expandEvent;
   }
 
   void expandEvent(bool exp, var done) {
     expand = exp;
     done();
   }
 }