From 49e78ed61c75dd2663db2d88f29336ccfdd58fc2 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Fri, 27 Feb 2015 16:36:41 -0800 Subject: [PATCH] Moved service_registry from services to mojo/services/service_registry It needs to be in a conventional public location to be available to consumer repos. R=tonyg@chromium.org Review URL: https://codereview.chromium.org/968493004 --- viewer/BUILD.gn | 2 +- viewer/document_view.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/viewer/BUILD.gn b/viewer/BUILD.gn index bffad8c9b4f..a9af9d896c9 100644 --- a/viewer/BUILD.gn +++ b/viewer/BUILD.gn @@ -44,9 +44,9 @@ mojo_native_application("viewer") { "//mojo/services/input_events/public/interfaces", "//mojo/services/navigation/public/interfaces", "//mojo/services/network/public/interfaces", + "//mojo/services/service_registry/public/interfaces", "//mojo/services/surfaces/public/interfaces", "//mojo/services/view_manager/public/cpp", - "//services/service_registry:bindings", "//skia", "//sky/compositor", "//sky/engine", diff --git a/viewer/document_view.h b/viewer/document_view.h index a4b8eb49f28..2de488d4873 100644 --- a/viewer/document_view.h +++ b/viewer/document_view.h @@ -15,10 +15,10 @@ #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h" #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" +#include "mojo/services/service_registry/public/interfaces/service_registry.mojom.h" #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h" #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h" #include "mojo/services/view_manager/public/cpp/view_observer.h" -#include "services/service_registry/service_registry.mojom.h" #include "sky/compositor/layer_client.h" #include "sky/compositor/layer_host_client.h" #include "sky/engine/public/platform/ServiceProvider.h"