[cleanup] remove public/lib/user/dart
Change-Id: I56e923de4dfcb9458ec025b17722a1e581e79267
diff --git a/README.md b/README.md
index bd6d4d6..eefcee8 100644
--- a/README.md
+++ b/README.md
@@ -42,3 +42,4 @@
* topaz/public/lib/decomposition: b34f97387
* topaz/public/lib/module_resolver: 2e13a4929
* topaz/public/lib/proposal: d32421a9d
+* topaz/public/lib/user: 62cc03e
diff --git a/public/dart/widgets/BUILD.gn b/public/dart/widgets/BUILD.gn
index c30b283..b150445 100644
--- a/public/dart/widgets/BUILD.gn
+++ b/public/dart/widgets/BUILD.gn
@@ -57,7 +57,6 @@
"//topaz/public/dart/fuchsia_scenic_flutter",
"//topaz/public/lib/app/dart",
"//topaz/public/lib/module/dart",
- "//topaz/public/lib/user/dart",
"//zircon/public/fidl/fuchsia-cobalt",
]
}
diff --git a/public/lib/user/dart/BUILD.gn b/public/lib/user/dart/BUILD.gn
deleted file mode 100644
index dca2a6d..0000000
--- a/public/lib/user/dart/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/dart/dart_library.gni")
-
-dart_library("dart") {
- package_name = "lib.user.dart"
-
- sdk_category = "partner"
-
- sources = [
- "src/session_shell_impl.dart",
- "user.dart",
- ]
-
- deps = [
- "//sdk/fidl/fuchsia.modular",
- "//topaz/public/dart/fidl",
- "//topaz/public/dart/fuchsia",
- "//topaz/public/lib/app/dart",
- "//topaz/public/lib/story/dart",
- ]
-}
diff --git a/public/lib/user/dart/analysis_options.yaml b/public/lib/user/dart/analysis_options.yaml
deleted file mode 100644
index 54917c0..0000000
--- a/public/lib/user/dart/analysis_options.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-include: ../../../analysis_options.yaml
diff --git a/public/lib/user/dart/lib/src/session_shell_impl.dart b/public/lib/user/dart/lib/src/session_shell_impl.dart
deleted file mode 100644
index f84412a..0000000
--- a/public/lib/user/dart/lib/src/session_shell_impl.dart
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:fidl_fuchsia_modular/fidl.dart';
-import 'package:lib.app.dart/app.dart';
-import 'package:lib.story.dart/story.dart';
-
-/// Called when [SessionShell.initialize] occurs.
-typedef OnSessionShellReady = void Function(
- SessionShellContext sessionShellContext,
- FocusProvider focusProvider,
- FocusController focusController,
- VisibleStoriesController visibleStoriesController,
- StoryProvider storyProvider,
- SuggestionProvider suggestionProvider,
- ContextReader contextReader,
- ContextWriter contextWriter,
- IntelligenceServices intelligenceServices,
- Link link,
-);
-
-/// Called at the beginning of [Lifecycle.terminate].
-typedef OnSessionShellStopping = void Function();
-
-/// Called at the conclusion of [Lifecycle.terminate].
-typedef OnSessionShellStop = void Function();
-
-/// Implements a SessionShell for receiving the services a [SessionShell] needs to
-/// operate.
-class SessionShellImpl implements Lifecycle {
- /// Binding for the actual SessionShell interface object.
- final SessionShellContextProxy _sessionShellContextProxy =
- SessionShellContextProxy();
- final FocusProviderProxy _focusProviderProxy = FocusProviderProxy();
- final FocusControllerProxy _focusControllerProxy = FocusControllerProxy();
- final VisibleStoriesControllerProxy _visibleStoriesControllerProxy =
- VisibleStoriesControllerProxy();
- final StoryProviderProxy _storyProviderProxy = StoryProviderProxy();
- final SuggestionProviderProxy _suggestionProviderProxy =
- SuggestionProviderProxy();
- final ContextReaderProxy _contextReaderProxy = ContextReaderProxy();
- final ContextWriterProxy _contextWriterProxy = ContextWriterProxy();
- final IntelligenceServicesProxy _intelligenceServicesProxy =
- IntelligenceServicesProxy();
- final LinkProxy _linkProxy = LinkProxy();
-
- /// Called when [initialize] occurs.
- final OnSessionShellReady onReady;
-
- /// Called at the beginning of [Lifecycle.terminate].
- final OnSessionShellStop onStopping;
-
- /// Called at the conclusion of [Lifecycle.terminate].
- final OnSessionShellStop onStop;
-
- /// Called when [LinkWatcher.notify] is called.
- final LinkWatcherNotifyCallback onNotify;
-
- /// Indicates whether the [LinkWatcher] should watch for all changes including
- /// the changes made by this [SessionShell]. If `true`, it calls [Link.watchAll]
- /// to register the [LinkWatcher], and [Link.watch] otherwise. Only takes
- /// effect when the [onNotify] callback is also provided. Defaults to `false`.
- final bool watchAll;
-
- LinkWatcherBinding _linkWatcherBinding;
- LinkWatcherImpl _linkWatcherImpl;
-
- /// Constructor.
- SessionShellImpl({
- startupContext,
- this.onReady,
- this.onStopping,
- this.onStop,
- this.onNotify,
- bool watchAll,
- }) : watchAll = watchAll ?? false {
- connectToService(
- startupContext.environmentServices, _sessionShellContextProxy.ctrl);
- connectToService(
- startupContext.environmentServices, _intelligenceServicesProxy.ctrl);
- _initialize();
- }
-
- void _initialize() {
- if (onReady != null) {
- _sessionShellContextProxy
- ..getStoryProvider(
- _storyProviderProxy.ctrl.request(),
- )
- ..getSuggestionProvider(
- _suggestionProviderProxy.ctrl.request(),
- )
- ..getVisibleStoriesController(
- _visibleStoriesControllerProxy.ctrl.request(),
- )
- ..getFocusController(
- _focusControllerProxy.ctrl.request(),
- )
- ..getFocusProvider(
- _focusProviderProxy.ctrl.request(),
- )
- ..getLink(_linkProxy.ctrl.request());
-
- _intelligenceServicesProxy
- ..getContextReader(_contextReaderProxy.ctrl.request())
- ..getContextWriter(_contextWriterProxy.ctrl.request());
-
- onReady(
- _sessionShellContextProxy,
- _focusProviderProxy,
- _focusControllerProxy,
- _visibleStoriesControllerProxy,
- _storyProviderProxy,
- _suggestionProviderProxy,
- _contextReaderProxy,
- _contextWriterProxy,
- _intelligenceServicesProxy,
- _linkProxy,
- );
- }
-
- if (onNotify != null) {
- _linkWatcherImpl = LinkWatcherImpl(onNotify: onNotify);
- _linkWatcherBinding = LinkWatcherBinding();
-
- if (watchAll) {
- _linkProxy.watchAll(_linkWatcherBinding.wrap(_linkWatcherImpl));
- } else {
- _linkProxy.watch(_linkWatcherBinding.wrap(_linkWatcherImpl));
- }
- }
- }
-
- @override
- void terminate() {
- onStopping?.call();
- _linkWatcherBinding?.close();
- _linkProxy.ctrl.close();
- _sessionShellContextProxy.ctrl.close();
- _storyProviderProxy.ctrl.close();
- _suggestionProviderProxy.ctrl.close();
- _visibleStoriesControllerProxy.ctrl.close();
- _focusControllerProxy.ctrl.close();
- _focusProviderProxy.ctrl.close();
- _contextReaderProxy.ctrl.close();
- _contextWriterProxy.ctrl.close();
- _intelligenceServicesProxy.ctrl.close();
- onStop?.call();
- }
-}
diff --git a/public/lib/user/dart/lib/user.dart b/public/lib/user/dart/lib/user.dart
deleted file mode 100644
index 6748136..0000000
--- a/public/lib/user/dart/lib/user.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-export 'src/session_shell_impl.dart';
diff --git a/public/lib/user/dart/pubspec.yaml b/public/lib/user/dart/pubspec.yaml
deleted file mode 100644
index e69de29..0000000
--- a/public/lib/user/dart/pubspec.yaml
+++ /dev/null
diff --git a/shell/ermine/BUILD.gn b/shell/ermine/BUILD.gn
index 62fdb76..6d10dc8 100644
--- a/shell/ermine/BUILD.gn
+++ b/shell/ermine/BUILD.gn
@@ -64,7 +64,6 @@
"//topaz/public/dart/fuchsia_scenic_flutter",
"//topaz/public/dart/fuchsia_services",
"//topaz/public/dart/widgets:lib.widgets",
- "//topaz/public/lib/story/dart",
]
}
