Introduced support for external services registration in the ServiceProtocol

runtime/observatory/lib/src/app/application.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.
 
 part of app;
 
 /// The observatory application. Instances of this are created and owned
 /// by the observatory_application custom element.
 class ObservatoryApplication {
   static ObservatoryApplication app;
@@ skipping 33 matching lines @@
       // Disconnect from current VM.
       stopGCEventListener();
       notifications.deleteAll();
       oldVM.disconnect();
     }
 
     if (newVM != null) {
       // Mark that we haven't connected yet.
       _vmConnected = false;
       // On connect:
-      newVM.onConnect.then((_) {
+      newVM.onConnect.then((_) async {
         // We connected.
         _vmConnected = true;
         notifications.deleteDisconnectEvents();
+        await newVM.load();
+        // TODO(cbernaschina) smart connection of streams in the events object.
+        newVM.listenEventStream(VM.kVMStream, _onEvent);
+        newVM.listenEventStream(VM.kIsolateStream, _onEvent);
+        newVM.listenEventStream(VM.kDebugStream, _onEvent);
+        newVM.listenEventStream(VM.kServiceStream, _onEvent);
       });
       // On disconnect:
       newVM.onDisconnect.then((String reason) {
         if (this.vm != newVM) {
           // This disconnect event occured *after* a new VM was installed.
           return;
         }
         // Let anyone looking at the targets know that we have disconnected
         // from one.
         targets.emitDisconnectEvent();
         if (!_vmConnected) {
           // Connection error. Navigate back to the connect page.
           Logger.root.info('Connection failed, navigating to VM connect page.');
           // Clear the vm.
           _vm = null;
           app.locationManager.go(Uris.vmConnect());
         } else {
           // Disconnect. Stay at the current page and push an a connection
           // closed event.
           Logger.root.info('Lost an existing connection to a VM');
           events.add(new ConnectionClosedEvent(new DateTime.now(), reason));
         }
       });
-      // TODO(cbernaschina) smart connection of streams in the events object.
-      newVM.listenEventStream(VM.kVMStream, _onEvent);
-      newVM.listenEventStream(VM.kIsolateStream, _onEvent);
-      newVM.listenEventStream(VM.kDebugStream, _onEvent);
     }
 
     _vm = newVM;
   }
 
   StreamSubscription _gcSubscription;
   StreamSubscription _loggingSubscription;
 
   Future startGCEventListener() async {
     if (_gcSubscription != null || _vm == null) {
@@ skipping 192 matching lines @@
     }
 
     // TODO(turnidge): Report this failure via analytics.
     Logger.root.warning('Caught exception: ${e}\n${st}');
     notifications.add(new ExceptionNotification(e, stacktrace: st));
   }
 
   // This map keeps track of which curly-blocks have been expanded by the user.
   Map<String, bool> expansions = {};
 }