Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Side by Side Diff: runtime/bin/vmservice/observatory/lib/src/app/application.dart

Issue 558703005: Do not navigate to vm-connect page upon disconnect (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | runtime/bin/vmservice/observatory/lib/src/app/location_manager.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 part of app; 5 part of app;
6 6
7 /// The observatory application. Instances of this are created and owned 7 /// The observatory application. Instances of this are created and owned
8 /// by the observatory_application custom element. 8 /// by the observatory_application custom element.
9 class ObservatoryApplication extends Observable { 9 class ObservatoryApplication extends Observable {
10 static ObservatoryApplication app; 10 static ObservatoryApplication app;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 event.isolate.reloadBreakpoints(); 80 event.isolate.reloadBreakpoints();
81 break; 81 break;
82 82
83 case 'BreakpointReached': 83 case 'BreakpointReached':
84 case 'IsolateInterrupted': 84 case 'IsolateInterrupted':
85 case 'ExceptionThrown': 85 case 'ExceptionThrown':
86 removePauseEvents(event.isolate); 86 removePauseEvents(event.isolate);
87 notifications.add(event); 87 notifications.add(event);
88 break; 88 break;
89 89
90
90 case 'GC': 91 case 'GC':
91 // Ignore GC events for now. 92 // Ignore GC events for now.
92 break; 93 break;
93 94
94 default: 95 default:
95 // Ignore unrecognized events. 96 // Ignore unrecognized events.
96 Logger.root.severe('Unrecognized event: $event'); 97 Logger.root.severe('Unrecognized event: $event');
97 break; 98 break;
98 } 99 }
99 } 100 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 _initOnce(true); 195 _initOnce(true);
195 } 196 }
196 197
197 ObservatoryApplication(this.rootElement) : 198 ObservatoryApplication(this.rootElement) :
198 locationManager = new HashLocationManager(), 199 locationManager = new HashLocationManager(),
199 targets = new TargetManager() { 200 targets = new TargetManager() {
200 vm = new WebSocketVM(targets.defaultTarget); 201 vm = new WebSocketVM(targets.defaultTarget);
201 _initOnce(false); 202 _initOnce(false);
202 } 203 }
203 204
205 void _removeDisconnectEvents() {
206 notifications.removeWhere((oldEvent) {
207 return (oldEvent.eventType == 'VMDisconnected');
208 });
209 }
210
204 _vmConnected(VM vm) { 211 _vmConnected(VM vm) {
205 if (vm is WebSocketVM) { 212 if (vm is WebSocketVM) {
206 targets.add(vm.target); 213 targets.add(vm.target);
207 } 214 }
215 _removeDisconnectEvents();
208 } 216 }
209 217
210 _vmDisconnected(VM vm) { 218 _vmDisconnected(VM vm) {
211 if (this.vm != vm) { 219 if (this.vm != vm) {
212 // This disconnect event occured *after* a new VM was installed. 220 // This disconnect event occured *after* a new VM was installed.
213 return; 221 return;
214 } 222 }
215 this.vm = null; 223 this.vm = null;
216 locationManager.go(locationManager.makeLink('/vm-connect/')); 224 notifications.add(new ServiceEvent.vmDisconencted());
217 } 225 }
218 } 226 }
OLDNEW
« no previous file with comments | « no previous file | runtime/bin/vmservice/observatory/lib/src/app/location_manager.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698