commit 1d2e914f1a7ee8c2664a30c69278c0d9a4290602
author David Worsham <dworsham@google.com> Sat Mar 23 01:22:15 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Sat Mar 23 01:22:15 2019 +0000
tree 8c64cfa6d62994617004ea2ff3d505baa7ba7080
parent e46479c8cc5620a8c28c59689e7c53158d61ec74

[flutter] Remove V1 ViewProvider

This is dead code.

SCN-901 #comment
SCN-1018 #comment

Change-Id: I82fab8509399e0e2d11e771693dde595e51ce78d

runtime/flutter_runner/component.cc

diff --git a/runtime/flutter_runner/component.cc b/runtime/flutter_runner/component.cc
index cafcdae..befa566 100644
--- a/runtime/flutter_runner/component.cc
+++ b/runtime/flutter_runner/component.cc
@@ -197,16 +197,6 @@
   // All launch arguments have been read. Perform service binding and
   // final settings configuration. The next call will be to create a view
   // for this application.
-
-  service_provider_dir->AddService(
-      fuchsia::ui::viewsv1::ViewProvider::Name_,
-      std::make_unique<vfs::Service>([this](zx::channel channel,
-                                            async_dispatcher_t* dispatcher) {
-        v1_shells_bindings_.AddBinding(
-            this, fidl::InterfaceRequest<fuchsia::ui::viewsv1::ViewProvider>(
-                      std::move(channel)));
-      }));
-
   service_provider_dir->AddService(
       fuchsia::ui::app::ViewProvider::Name_,
       std::make_unique<vfs::Service>([this](zx::channel channel,
@@ -489,14 +479,6 @@
   }
 }
 
-// |fuchsia::ui::viewsv1::ViewProvider|
-void Application::CreateView(
-    fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner> view_owner,
-    fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) {
-  CreateView(zx::eventpair(view_owner.TakeChannel().release()),
-             std::move(services), nullptr);
-}
-
 // |fuchsia::ui::app::ViewProvider|
 void Application::CreateView(
     zx::eventpair view_token,

runtime/flutter_runner/component.h

diff --git a/runtime/flutter_runner/component.h b/runtime/flutter_runner/component.h
index 3e00c68..4acf2f9 100644
--- a/runtime/flutter_runner/component.h
+++ b/runtime/flutter_runner/component.h
@@ -12,8 +12,6 @@
 #include <fuchsia/io/cpp/fidl.h>
 #include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
-#include <fuchsia/ui/viewsv1/cpp/fidl.h>
-#include <fuchsia/ui/viewsv1token/cpp/fidl.h>
 #include <lib/async/default.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/fit/function.h>
@@ -36,7 +34,6 @@
 // Flutter engine instances.
 class Application final : public Engine::Delegate,
                           public fuchsia::sys::ComponentController,
-                          public fuchsia::ui::viewsv1::ViewProvider,
                           public fuchsia::ui::app::ViewProvider {
  public:
   using TerminationCallback = fit::function<void(const Application*)>;
@@ -77,7 +74,6 @@
   std::unique_ptr<sys::ComponentContext> component_context_;
   std::shared_ptr<sys::ServiceDirectory> runner_incoming_services_;
   fidl::BindingSet<fuchsia::ui::app::ViewProvider> shells_bindings_;
-  fidl::BindingSet<fuchsia::ui::viewsv1::ViewProvider> v1_shells_bindings_;
 
   fml::RefPtr<blink::DartSnapshot> isolate_snapshot_;
   fml::RefPtr<blink::DartSnapshot> shared_snapshot_;
@@ -96,11 +92,6 @@
   // |fuchsia::sys::ComponentController|
   void Detach() override;
 
-  // |fuchsia::ui::viewsv1::ViewProvider|
-  void CreateView(
-      fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner> view_owner,
-      fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) override;
-
   // |fuchsia::ui::app::ViewProvider|
   void CreateView(
       zx::eventpair view_token,