commit 009ca7aee57b595862f215e0430f96f7a98e9400
author David Worsham <dworsham@google.com> Sun Feb 17 18:15:55 2019 -0800
committer David Worsham <dworsham@google.com> Wed Feb 20 08:35:32 2019 -0800
tree be1354b839bce4ecdb1b5f7872ae4868be0afe2c
parent 8d17c0af3a30200cc73b8065f6621c1d113f522e

[child_view] Move lib.module ChildView use to SDK

TEST: Ran SysUI; Started a story
SCN-898 #comment
SCN-1033 #comment
SCN-1214 #comment

Change-Id: Ia79e419f6aca37c9e1ddbbbe07d202fa7b0d8033

public/lib/module/dart/BUILD.gn

diff --git a/public/lib/module/dart/BUILD.gn b/public/lib/module/dart/BUILD.gn
index ac655a6..133fe33 100644
--- a/public/lib/module/dart/BUILD.gn
+++ b/public/lib/module/dart/BUILD.gn
@@ -16,13 +16,15 @@
   ]
 
   deps = [
-    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//sdk/fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.viewsv1token",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
+    "//topaz/public/dart/fuchsia_scenic_flutter",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/component/dart",
     "//topaz/public/lib/story/dart",
-    "//topaz/public/lib/ui/flutter",
   ]
 }

public/lib/module/dart/lib/src/module_context_client.dart

diff --git a/public/lib/module/dart/lib/src/module_context_client.dart b/public/lib/module/dart/lib/src/module_context_client.dart
index 7069b7a..03447d3 100644
--- a/public/lib/module/dart/lib/src/module_context_client.dart
+++ b/public/lib/module/dart/lib/src/module_context_client.dart
@@ -6,13 +6,16 @@
 
 import 'package:fidl/fidl.dart';
 import 'package:fidl_fuchsia_modular/fidl.dart' as fidl;
-// See DNO-201 for details on the _view_token path.
+import 'package:fidl_fuchsia_ui_gfx/fidl_async.dart';
 import 'package:fidl_fuchsia_ui_viewsv1token/fidl.dart';
+import 'package:fuchsia_scenic_flutter/child_view.dart' show ChildView;
+import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
+    show ChildViewConnection;
 import 'package:lib.app.dart/logging.dart';
 import 'package:lib.component.dart/component.dart';
 import 'package:lib.story.dart/story.dart';
-import 'package:lib.ui.flutter/child_view.dart';
 import 'package:meta/meta.dart';
+import 'package:zircon/zircon.dart';
 
 import 'module_controller_client.dart';
 
@@ -251,7 +254,9 @@
 
           // TODO(MS-1437): viewOwner error handling.
           ChildViewConnection connection =
-              new ChildViewConnection(viewOwner.passHandle());
+              ChildViewConnection.fromImportToken(ImportToken(
+            value: EventPair(viewOwner.passHandle().passChannel().passHandle()),
+          ));
 
           EmbeddedModule result = new EmbeddedModule(
             controller: controller,