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

Unified Diff: runtime/observatory/lib/src/elements/helpers/uris.dart

Issue 2177643003: Fixed automatic Merge error with vm-nav-menu branch (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/observatory/lib/src/elements/nav_bar.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/observatory/lib/src/elements/helpers/uris.dart
diff --git a/runtime/observatory/lib/src/elements/helpers/uris.dart b/runtime/observatory/lib/src/elements/helpers/uris.dart
index 179a4ee59f6a4c91d420c78e5b0d86e51061eab7..1c9660c3d645f1e910b910204439735b0edf2526 100644
--- a/runtime/observatory/lib/src/elements/helpers/uris.dart
+++ b/runtime/observatory/lib/src/elements/helpers/uris.dart
@@ -8,10 +8,9 @@ import 'package:observatory/models.dart' as M;
abstract class Uris {
static String _isolatePage(String path, M.IsolateRef isolate,
{M.ObjectRef object}) {
- return '#' + new Uri(path: path, queryParameters: {
- 'isolateId': isolate.id,
- 'objectId': object?.id
- }).toString();
+ final parameters = { 'isolateId': isolate.id };
+ if (object != null) parameters['objectId'] = object.id;
+ return '#' + new Uri(path: path, queryParameters: parameters).toString();
}
static String inspect(M.IsolateRef isolate, {M.ObjectRef object})
« no previous file with comments | « no previous file | runtime/observatory/lib/src/elements/nav_bar.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698