From f306a6f7011244e5b5c7470e178760bf87560e4b Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 8 Feb 2017 13:02:40 -0800 Subject: [PATCH] Updates for application extraction from //apps/modular (#3397) --- content_handler/BUILD.gn | 2 +- content_handler/app.h | 4 ++-- content_handler/application_controller_impl.cc | 2 +- content_handler/application_controller_impl.h | 6 +++--- content_handler/runtime_holder.cc | 2 +- content_handler/runtime_holder.h | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content_handler/BUILD.gn b/content_handler/BUILD.gn index 28a761657..f6291d8b7 100644 --- a/content_handler/BUILD.gn +++ b/content_handler/BUILD.gn @@ -32,7 +32,7 @@ executable("content_handler") { ] deps = [ - "//apps/modular/lib/app", + "//application/lib/app", "//apps/mozart/lib/skia:vmo", "//apps/mozart/services/buffers", "//apps/mozart/services/buffers/cpp", diff --git a/content_handler/app.h b/content_handler/app.h index 82efc854f..2514991d3 100644 --- a/content_handler/app.h +++ b/content_handler/app.h @@ -8,8 +8,8 @@ #include #include -#include "apps/modular/lib/app/application_context.h" -#include "apps/modular/services/application/application_runner.fidl.h" +#include "application/lib/app/application_context.h" +#include "application/services/application_runner.fidl.h" #include "flutter/content_handler/application_controller_impl.h" #include "flutter/content_handler/content_handler_thread.h" #include "lib/ftl/macros.h" diff --git a/content_handler/application_controller_impl.cc b/content_handler/application_controller_impl.cc index d724fa7ae..7120aaf02 100644 --- a/content_handler/application_controller_impl.cc +++ b/content_handler/application_controller_impl.cc @@ -6,7 +6,7 @@ #include -#include "apps/modular/lib/app/connect.h" +#include "application/lib/app/connect.h" #include "flutter/content_handler/app.h" #include "flutter/content_handler/runtime_holder.h" #include "lib/ftl/logging.h" diff --git a/content_handler/application_controller_impl.h b/content_handler/application_controller_impl.h index 18cae0380..24a30f4b8 100644 --- a/content_handler/application_controller_impl.h +++ b/content_handler/application_controller_impl.h @@ -7,9 +7,9 @@ #include -#include "apps/modular/services/application/application_controller.fidl.h" -#include "apps/modular/services/application/application_runner.fidl.h" -#include "apps/modular/services/application/service_provider.fidl.h" +#include "application/services/application_controller.fidl.h" +#include "application/services/application_runner.fidl.h" +#include "application/services/service_provider.fidl.h" #include "apps/mozart/services/views/view_provider.fidl.h" #include "lib/fidl/cpp/bindings/binding.h" #include "lib/fidl/cpp/bindings/binding_set.h" diff --git a/content_handler/runtime_holder.cc b/content_handler/runtime_holder.cc index e1a6457f1..96b5ebcc3 100644 --- a/content_handler/runtime_holder.cc +++ b/content_handler/runtime_holder.cc @@ -6,7 +6,7 @@ #include -#include "apps/modular/lib/app/connect.h" +#include "application/lib/app/connect.h" #include "dart/runtime/include/dart_api.h" #include "flutter/assets/zip_asset_store.h" #include "flutter/common/threads.h" diff --git a/content_handler/runtime_holder.h b/content_handler/runtime_holder.h index 6912d5a88..ff5002ef0 100644 --- a/content_handler/runtime_holder.h +++ b/content_handler/runtime_holder.h @@ -9,8 +9,8 @@ #include -#include "apps/modular/services/application/application_environment.fidl.h" -#include "apps/modular/services/application/service_provider.fidl.h" +#include "application/services/application_environment.fidl.h" +#include "application/services/service_provider.fidl.h" #include "apps/mozart/services/input/input_connection.fidl.h" #include "apps/mozart/services/views/view_manager.fidl.h" #include "flutter/assets/unzipper_provider.h" -- GitLab