commit 04045168b6813cb9659ad87920dc7f419e98569f
author David Worsham <dworsham@google.com> Sun Feb 17 18:20:41 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Feb 20 00:04:36 2019 +0000
tree 930042fe569a86a75ef58efa2de7b96b86bf3908
parent 902ae374a37f6b8a5b408a88e37dda80086ae08e

[child_view] Move xi ChildView use to SDK

TEST: sessionctl add_mod xi_mod; sessionctl add_mod xi_session_demo
SCN-898 #comment
SCN-1033 #comment
SCN-1214 #comment

Change-Id: I2fb3f179f2ebb57af4fbaa7e2a6ae845294f3325

bin/xi/xi_mod/BUILD.gn

diff --git a/bin/xi/xi_mod/BUILD.gn b/bin/xi/xi_mod/BUILD.gn
index 8d79313..0384923 100644
--- a/bin/xi/xi_mod/BUILD.gn
+++ b/bin/xi/xi_mod/BUILD.gn
@@ -17,15 +17,13 @@
 
   sources = []
   deps = [
-    "//sdk/fidl/fuchsia.ui.viewsv1",
-    "//sdk/fidl/fuchsia.xi",
     "//sdk/fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.xi",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
     "//topaz/lib/xi/widgets:xi_widgets",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
-    "//topaz/public/lib/ui/flutter",
   ]
 }

bin/xi/xi_session_demo/BUILD.gn

diff --git a/bin/xi/xi_session_demo/BUILD.gn b/bin/xi/xi_session_demo/BUILD.gn
index 85a7847..423f905 100644
--- a/bin/xi/xi_session_demo/BUILD.gn
+++ b/bin/xi/xi_session_demo/BUILD.gn
@@ -16,8 +16,12 @@
   ]
 
   deps = [
+    "//sdk/fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.viewsv1token",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/bin/xi/xi_session_agent:xi_session_services",
+    "//topaz/public/dart/fuchsia_scenic_flutter",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/widgets/dart",

bin/xi/xi_session_demo/lib/src/demo_model.dart

diff --git a/bin/xi/xi_session_demo/lib/src/demo_model.dart b/bin/xi/xi_session_demo/lib/src/demo_model.dart
index c3e8eb14..eaff739 100644
--- a/bin/xi/xi_session_demo/lib/src/demo_model.dart
+++ b/bin/xi/xi_session_demo/lib/src/demo_model.dart
@@ -6,12 +6,15 @@
 
 import 'package:fidl/fidl.dart';
 import 'package:fidl_fuchsia_modular/fidl.dart';
+import 'package:fidl_fuchsia_ui_gfx/fidl_async.dart';
 import 'package:fidl_fuchsia_ui_viewsv1token/fidl.dart';
 import 'package:fidl_fuchsia_xi_session/fidl_async.dart';
-import 'package:lib.ui.flutter/child_view.dart';
-import 'package:lib.app.dart/logging.dart';
+import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
+    show ChildViewConnection;
 import 'package:lib.app_driver.dart/module_driver.dart';
+import 'package:lib.app.dart/logging.dart';
 import 'package:lib.widgets.dart/model.dart';
+import 'package:zircon/zircon.dart';
 
 const String kSessionManagerURL =
     'fuchsia-pkg://fuchsia.com/xi_session_agent#meta/xi_session_agent.cmx';
@@ -107,7 +110,9 @@
         intentBuilder.intent,
         editorController.proxy.ctrl.request(),
         viewOwner.passRequest(), (StartModuleStatus status) {
-      editorConn = ChildViewConnection(viewOwner.passHandle());
+      editorConn = ChildViewConnection.fromImportToken(ImportToken(
+        value: EventPair(viewOwner.passHandle().passChannel().passHandle()),
+      ));
       log.info('Start embeddable intent status = $status');
     });
   }

bin/xi/xi_session_demo/lib/src/demo_widget.dart

diff --git a/bin/xi/xi_session_demo/lib/src/demo_widget.dart b/bin/xi/xi_session_demo/lib/src/demo_widget.dart
index 34741e0..7f00767 100644
--- a/bin/xi/xi_session_demo/lib/src/demo_widget.dart
+++ b/bin/xi/xi_session_demo/lib/src/demo_widget.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:lib.ui.flutter/child_view.dart';
+import 'package:fuchsia_scenic_flutter/child_view.dart' show ChildView;
 import 'package:lib.widgets.dart/model.dart';
 
 import 'demo_model.dart';