From 2ddea42948ddadb75cb47d279a75ecddcc04632f Mon Sep 17 00:00:00 2001 From: Colin Blundell Date: Thu, 11 Dec 2014 08:16:09 +0100 Subject: [PATCH] Restructure public side of content_handler service. This CL goes from this: //mojo/services/public/interfaces/content_handler to this: //mojo/services/content_handler/public/interfaces This CL also makes the Mojo-side changes necessary to roll this change into Chromium. TBR=beng Review URL: https://codereview.chromium.org/793243002 --- viewer/BUILD.gn | 2 +- viewer/content_handler_impl.h | 2 +- viewer/document_view.h | 2 +- viewer/viewer.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/viewer/BUILD.gn b/viewer/BUILD.gn index 5b949974e75..67b6cd14078 100644 --- a/viewer/BUILD.gn +++ b/viewer/BUILD.gn @@ -49,10 +49,10 @@ mojo_native_application("viewer") { "//mojo/public/cpp/system", "//mojo/public/cpp/utility", "//mojo/public/interfaces/application", + "//mojo/services/content_handler/public/interfaces", "//mojo/services/gpu/public/interfaces", "//mojo/services/input_events/public/interfaces", "//mojo/services/network/public/interfaces", - "//mojo/services/public/interfaces/content_handler", "//mojo/services/public/interfaces/navigation", "//mojo/services/surfaces/public/interfaces", "//mojo/services/view_manager/public/cpp", diff --git a/viewer/content_handler_impl.h b/viewer/content_handler_impl.h index c7c429ba322..12360f35366 100644 --- a/viewer/content_handler_impl.h +++ b/viewer/content_handler_impl.h @@ -7,7 +7,7 @@ #include "base/message_loop/message_loop.h" #include "mojo/public/interfaces/application/shell.mojom.h" -#include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h" +#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h" namespace sky { class DocumentView; diff --git a/viewer/document_view.h b/viewer/document_view.h index ed5410d8306..6150cf337bc 100644 --- a/viewer/document_view.h +++ b/viewer/document_view.h @@ -11,8 +11,8 @@ #include "mojo/public/cpp/application/service_provider_impl.h" #include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/public/interfaces/application/application.mojom.h" +#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" -#include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h" #include "mojo/services/public/interfaces/navigation/navigation.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" diff --git a/viewer/viewer.cc b/viewer/viewer.cc index 9db52a1e53e..eb5b6d0fba3 100644 --- a/viewer/viewer.cc +++ b/viewer/viewer.cc @@ -12,7 +12,7 @@ #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/application/interface_factory_impl.h" -#include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h" +#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h" #include "sky/engine/public/web/Sky.h" #include "sky/viewer/content_handler_impl.h" #include "sky/viewer/document_view.h"