From 4a5132bbd4e9cfc71923ad809668614aa3c8c38b Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Thu, 5 Nov 2015 21:05:30 -0800
Subject: [PATCH] Remove scaffolding for Navigator1 to Navigator2 transition

These types belong at the MaterialApp level.

Fixes #1969
---
 sky/packages/sky/lib/src/material/material_app.dart | 7 +++++++
 sky/packages/sky/lib/src/widgets/navigator.dart     | 9 ---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sky/packages/sky/lib/src/material/material_app.dart b/sky/packages/sky/lib/src/material/material_app.dart
index 01be12943e4..f0a71f7442b 100644
--- a/sky/packages/sky/lib/src/material/material_app.dart
+++ b/sky/packages/sky/lib/src/material/material_app.dart
@@ -31,6 +31,13 @@ AssetBundle _initDefaultBundle() {
 
 final AssetBundle _defaultBundle = _initDefaultBundle();
 
+class RouteArguments {
+  const RouteArguments({ this.context });
+  final BuildContext context;
+}
+typedef Widget RouteBuilder(RouteArguments args);
+typedef RouteBuilder RouteGenerator(String name);
+
 class MaterialApp extends StatefulComponent {
   MaterialApp({
     Key key,
diff --git a/sky/packages/sky/lib/src/widgets/navigator.dart b/sky/packages/sky/lib/src/widgets/navigator.dart
index 22a2cc38a6a..a35bcf2210c 100644
--- a/sky/packages/sky/lib/src/widgets/navigator.dart
+++ b/sky/packages/sky/lib/src/widgets/navigator.dart
@@ -5,15 +5,6 @@
 import 'framework.dart';
 import 'overlay.dart';
 
-// ---------------- Begin scaffolding for Navigator1 to Navigator2 transition
-class RouteArguments {
-  const RouteArguments({ this.context });
-  final BuildContext context;
-}
-typedef Widget RouteBuilder(RouteArguments args);
-typedef RouteBuilder RouteGenerator(String name);
-// ---------------- End scaffolding for Navigator1 to Navigator2 transition
-
 abstract class Route {
   List<OverlayEntry> get overlayEntries;