Commit 33cb0455 authored by blundell's avatar blundell Committed by Commit bot

Move services code brought in from Mojo to live under //third_party.

This CL moves services code that is brought in from the Mojo repo and currently
living in //mojo/services to instead live in //third_party/mojo_services/src.
It fixes up include paths, buildfile references, and DEPS entries to account
for the new state of the world.

Review URL: https://codereview.chromium.org/861683003

Cr-Commit-Position: refs/heads/master@{#313876}
parent 673df3d9
...@@ -14,6 +14,6 @@ mojom("interfaces") { ...@@ -14,6 +14,6 @@ mojom("interfaces") {
] ]
deps = [ deps = [
"//mojo/services/geometry/public/interfaces", "//third_party/mojo_services/src/geometry/public/interfaces",
] ]
} }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
module mojo; module mojo;
import "mojo/services/geometry/public/interfaces/geometry.mojom"; import "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom";
// See media/base/buffering_state.h for descriptions. // See media/base/buffering_state.h for descriptions.
// Kept in sync with media::BufferingState via static_asserts. // Kept in sync with media::BufferingState via static_asserts.
......
...@@ -32,9 +32,9 @@ source_set("converters") { ...@@ -32,9 +32,9 @@ source_set("converters") {
"//mojo/common", "//mojo/common",
"//mojo/converters/geometry", "//mojo/converters/geometry",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/geometry/public/interfaces",
"//skia", "//skia",
"//third_party/mojo/src/mojo/public/c/system:for_component", "//third_party/mojo/src/mojo/public/c/system:for_component",
"//third_party/mojo_services/src/geometry/public/interfaces",
] ]
} }
......
# This subdirectory is being canonically developed in the mojo repository,
# please land changes there or they will be blown away by the next sync.
# See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nAwEbgCrUio/73AA2fnfcpEJ
# for more details.
ben@chromium.org ben@chromium.org
jamesr@chromium.org jamesr@chromium.org
...@@ -12,11 +12,11 @@ source_set("cc") { ...@@ -12,11 +12,11 @@ source_set("cc") {
"//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/client:gles2_interface",
"//mojo/converters/surfaces", "//mojo/converters/surfaces",
"//mojo/services/surfaces/public/interfaces",
"//skia", "//skia",
"//third_party/mojo/src/mojo/public/c/gles2", "//third_party/mojo/src/mojo/public/c/gles2",
"//third_party/mojo/src/mojo/public/cpp/environment", "//third_party/mojo/src/mojo/public/cpp/environment",
"//third_party/mojo/src/mojo/public/cpp/system", "//third_party/mojo/src/mojo/public/cpp/system",
"//third_party/mojo_services/src/surfaces/public/interfaces",
] ]
sources = [ sources = [
......
...@@ -2,4 +2,5 @@ include_rules = [ ...@@ -2,4 +2,5 @@ include_rules = [
"+cc", "+cc",
"-cc/blink", "-cc/blink",
"+gpu/command_buffer/client", "+gpu/command_buffer/client",
"+third_party/mojo_services/src/surfaces",
] ]
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "cc/output/output_surface.h" #include "cc/output/output_surface.h"
#include "cc/surfaces/surface_id.h" #include "cc/surfaces/surface_id.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h" #include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom.h"
namespace mojo { namespace mojo {
......
...@@ -13,8 +13,8 @@ component("geometry") { ...@@ -13,8 +13,8 @@ component("geometry") {
"//skia", "//skia",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/geometry/public/interfaces",
"//third_party/mojo/src/mojo/public/c/system:for_component", "//third_party/mojo/src/mojo/public/c/system:for_component",
"//third_party/mojo_services/src/geometry/public/interfaces",
] ]
defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ] defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ]
......
include_rules = [ include_rules = [
"+third_party/mojo_services/src/geometry",
"+ui/gfx/geometry", "+ui/gfx/geometry",
"+ui/gfx/transform.h", "+ui/gfx/transform.h",
] ]
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ #define MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
#include "mojo/converters/geometry/mojo_geometry_export.h" #include "mojo/converters/geometry/mojo_geometry_export.h"
#include "mojo/services/geometry/public/interfaces/geometry.mojom.h" #include "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom.h"
#include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
......
...@@ -19,8 +19,8 @@ component("input_events") { ...@@ -19,8 +19,8 @@ component("input_events") {
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//mojo/converters/geometry", "//mojo/converters/geometry",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/input_events/public/interfaces",
"//mojo/services/geometry/public/interfaces",
"//third_party/mojo/src/mojo/public/c/system:for_component", "//third_party/mojo/src/mojo/public/c/system:for_component",
"//third_party/mojo_services/src/input_events/public/interfaces",
"//third_party/mojo_services/src/geometry/public/interfaces",
] ]
} }
include_rules = [ include_rules = [
"+third_party/mojo_services/src/input_events",
"+ui/events", "+ui/events",
] ]
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/mojo_extended_key_event_data.h" #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
#include "mojo/services/input_events/public/interfaces/input_events.mojom.h" #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
#include "ui/events/event_utils.h" #include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/keycodes/keyboard_codes.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "mojo/converters/input_events/mojo_input_events_export.h" #include "mojo/converters/input_events/mojo_input_events_export.h"
#include "mojo/services/input_events/public/interfaces/input_events.mojom.h" #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
#include "ui/events/event.h" #include "ui/events/event.h"
namespace mojo { namespace mojo {
......
...@@ -28,9 +28,9 @@ component("surfaces") { ...@@ -28,9 +28,9 @@ component("surfaces") {
"//gpu", "//gpu",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//mojo/services/surfaces/public/interfaces",
"//skia", "//skia",
"//third_party/mojo/src/mojo/public/c/system:for_component", "//third_party/mojo/src/mojo/public/c/system:for_component",
"//third_party/mojo_services/src/surfaces/public/interfaces:surface_id",
"//third_party/mojo_services/src/surfaces/public/interfaces",
] ]
} }
...@@ -5,6 +5,7 @@ include_rules = [ ...@@ -5,6 +5,7 @@ include_rules = [
"+cc/surfaces", "+cc/surfaces",
"+gpu/command_buffer/common/mailbox.h", "+gpu/command_buffer/common/mailbox.h",
"+gpu/command_buffer/common/mailbox_holder.h", "+gpu/command_buffer/common/mailbox_holder.h",
"+third_party/mojo_services/src/surfaces",
"+third_party/skia/include", "+third_party/skia/include",
"+ui/gfx/geometry", "+ui/gfx/geometry",
"+ui/gfx/transform.h", "+ui/gfx/transform.h",
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/common/mailbox_holder.h" #include "gpu/command_buffer/common/mailbox_holder.h"
#include "mojo/converters/surfaces/mojo_surfaces_export.h" #include "mojo/converters/surfaces/mojo_surfaces_export.h"
#include "mojo/services/surfaces/public/interfaces/quads.mojom.h" #include "third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h" #include "third_party/mojo_services/src/surfaces/public/interfaces/surface_id.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h" #include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
namespace cc { namespace cc {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define MOJO_CONVERTERS_SURFACES_SURFACES_UTILS_H_ #define MOJO_CONVERTERS_SURFACES_SURFACES_UTILS_H_
#include "mojo/converters/surfaces/mojo_surfaces_export.h" #include "mojo/converters/surfaces/mojo_surfaces_export.h"
#include "mojo/services/surfaces/public/interfaces/quads.mojom.h" #include "third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom.h"
namespace gfx { namespace gfx {
class Rect; class Rect;
......
...@@ -15,11 +15,11 @@ test("mojo_surfaces_lib_unittests") { ...@@ -15,11 +15,11 @@ test("mojo_surfaces_lib_unittests") {
"//mojo/converters/geometry", "//mojo/converters/geometry",
"//mojo/converters/surfaces", "//mojo/converters/surfaces",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/geometry/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
"//third_party/mojo_services/src/geometry/public/interfaces",
"//third_party/mojo_services/src/surfaces/public/interfaces",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gfx:test_support", "//ui/gfx:test_support",
......
...@@ -6,15 +6,15 @@ import("//build/config/ui.gni") ...@@ -6,15 +6,15 @@ import("//build/config/ui.gni")
group("services") { group("services") {
deps = [ deps = [
"//mojo/services/clipboard/public/interfaces",
"//mojo/services/content_handler/public/interfaces",
"//mojo/services/geometry/public/interfaces",
"//mojo/services/input_events/public/interfaces",
"//mojo/services/native_viewport/public/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/network/public/interfaces", "//mojo/services/network/public/interfaces",
"//mojo/services/surfaces/public/interfaces", "//third_party/mojo_services/src/clipboard/public/interfaces",
"//mojo/services/view_manager/public/interfaces", "//third_party/mojo_services/src/content_handler/public/interfaces",
"//third_party/mojo_services/src/geometry/public/interfaces",
"//third_party/mojo_services/src/input_events/public/interfaces",
"//third_party/mojo_services/src/native_viewport/public/interfaces",
"//third_party/mojo_services/src/navigation/public/interfaces",
"//third_party/mojo_services/src/surfaces/public/interfaces",
"//third_party/mojo_services/src/view_manager/public/interfaces",
] ]
if (!is_component_build) { if (!is_component_build) {
......
...@@ -83,27 +83,27 @@ source_set("lib") { ...@@ -83,27 +83,27 @@ source_set("lib") {
"//mojo/common", "//mojo/common",
"//mojo/converters/surfaces", "//mojo/converters/surfaces",
"//mojo/services/network/public/cpp", "//mojo/services/network/public/cpp",
"//mojo/services/accessibility/public/interfaces",
"//mojo/services/clipboard/public/interfaces",
"//mojo/services/content_handler/public/interfaces",
"//mojo/services/gpu/public/interfaces",
"//mojo/services/input_events/public/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/network/public/interfaces", "//mojo/services/network/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//net", "//net",
"//skia", "//skia",
"//third_party/mojo/src/mojo/public/c/system:for_shared_library", "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
"//third_party/mojo/src/mojo/public/cpp/utility", "//third_party/mojo/src/mojo/public/cpp/utility",
"//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo/src/mojo/public/interfaces/application",
"//third_party/mojo_services/src/accessibility/public/interfaces",
"//third_party/mojo_services/src/clipboard/public/interfaces",
"//third_party/mojo_services/src/content_handler/public/interfaces",
"//third_party/mojo_services/src/gpu/public/interfaces",
"//third_party/mojo_services/src/input_events/public/interfaces",
"//third_party/mojo_services/src/navigation/public/interfaces",
"//third_party/mojo_services/src/surfaces/public/interfaces",
"//ui/native_theme", "//ui/native_theme",
"//url", "//url",
] ]
public_deps = [ public_deps = [
"//mojo/services/view_manager/public/cpp",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
"//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/bindings",
"//third_party/mojo_services/src/view_manager/public/cpp",
":generate_blink_resource_map", ":generate_blink_resource_map",
] ]
} }
......
...@@ -6,9 +6,10 @@ include_rules = [ ...@@ -6,9 +6,10 @@ include_rules = [
"+mojo/cc", "+mojo/cc",
"+mojo/converters/surfaces", "+mojo/converters/surfaces",
"+mojo/application", "+mojo/application",
"+mojo/services", "+mojo/services/network",
"+net/base", "+net/base",
"+skia", "+skia",
"+third_party/mojo_services/src",
"+third_party/WebKit/public", "+third_party/WebKit/public",
"+third_party/skia/include", "+third_party/skia/include",
"+ui/base", "+ui/base",
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#ifndef MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_ #ifndef MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_
#define MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_ #define MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_
#include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
#include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
namespace blink { namespace blink {
class WebAXObject; class WebAXObject;
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
#include "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom.h"
namespace blink { namespace blink {
struct WebRect; struct WebRect;
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "mojo/services/input_events/public/interfaces/input_event_constants.mojom.h"
#include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom.h"
namespace mojo { namespace mojo {
namespace { namespace {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define MOJO_SERVICES_HTML_VIEWER_BLINK_INPUT_EVENTS_TYPE_CONVERTERS_H_ #define MOJO_SERVICES_HTML_VIEWER_BLINK_INPUT_EVENTS_TYPE_CONVERTERS_H_
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "mojo/services/input_events/public/interfaces/input_events.mojom.h" #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
namespace blink { namespace blink {
class WebInputEvent; class WebInputEvent;
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include "mojo/services/html_viewer/webmediaplayer_factory.h" #include "mojo/services/html_viewer/webmediaplayer_factory.h"
#include "mojo/services/html_viewer/webstoragenamespace_impl.h" #include "mojo/services/html_viewer/webstoragenamespace_impl.h"
#include "mojo/services/html_viewer/weburlloader_impl.h" #include "mojo/services/html_viewer/weburlloader_impl.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "skia/ext/refptr.h" #include "skia/ext/refptr.h"
#include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/platform/Platform.h"
#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
...@@ -37,6 +35,8 @@ ...@@ -37,6 +35,8 @@
#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkDevice.h" #include "third_party/skia/include/core/SkDevice.h"
......
...@@ -9,13 +9,8 @@ ...@@ -9,13 +9,8 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/macros.h" #include "base/macros.h"
#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
#include "mojo/services/html_viewer/ax_provider_impl.h" #include "mojo/services/html_viewer/ax_provider_impl.h"
#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
#include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.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 "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/WebKit/public/web/WebFrameClient.h"
#include "third_party/WebKit/public/web/WebSandboxFlags.h" #include "third_party/WebKit/public/web/WebSandboxFlags.h"
#include "third_party/WebKit/public/web/WebViewClient.h" #include "third_party/WebKit/public/web/WebViewClient.h"
...@@ -24,6 +19,11 @@ ...@@ -24,6 +19,11 @@
#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
#include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h" #include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h"
#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
#include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
#include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h"
#include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"
#include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h"
namespace base { namespace base {
class MessageLoopProxy; class MessageLoopProxy;
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "gin/public/isolate_holder.h" #include "gin/public/isolate_holder.h"
#include "mojo/application/application_runner_chromium.h" #include "mojo/application/application_runner_chromium.h"
#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
#include "mojo/services/html_viewer/html_document.h" #include "mojo/services/html_viewer/html_document.h"
#include "mojo/services/html_viewer/mojo_blink_platform_impl.h" #include "mojo/services/html_viewer/mojo_blink_platform_impl.h"
#include "mojo/services/html_viewer/webmediaplayer_factory.h" #include "mojo/services/html_viewer/webmediaplayer_factory.h"
...@@ -24,6 +23,7 @@ ...@@ -24,6 +23,7 @@
#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
#if !defined(COMPONENT_BUILD) #if !defined(COMPONENT_BUILD)
#include "base/i18n/icu_util.h" #include "base/i18n/icu_util.h"
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#ifndef MOJO_SERVICES_HTML_VIEWER_WEBCLIPBOARD_IMPL_H_ #ifndef MOJO_SERVICES_HTML_VIEWER_WEBCLIPBOARD_IMPL_H_
#define MOJO_SERVICES_HTML_VIEWER_WEBCLIPBOARD_IMPL_H_ #define MOJO_SERVICES_HTML_VIEWER_WEBCLIPBOARD_IMPL_H_
#include "mojo/services/clipboard/public/interfaces/clipboard.mojom.h"
#include "third_party/WebKit/public/platform/WebClipboard.h" #include "third_party/WebKit/public/platform/WebClipboard.h"
#include "third_party/mojo_services/src/clipboard/public/interfaces/clipboard.mojom.h"
namespace html_viewer { namespace html_viewer {
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "mojo/cc/context_provider_mojo.h" #include "mojo/cc/context_provider_mojo.h"
#include "mojo/cc/output_surface_mojo.h" #include "mojo/cc/output_surface_mojo.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "third_party/WebKit/public/web/WebWidget.h" #include "third_party/WebKit/public/web/WebWidget.h"
#include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
namespace html_viewer { namespace html_viewer {
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "cc/trees/layer_tree_host_client.h" #include "cc/trees/layer_tree_host_client.h"
#include "mojo/cc/output_surface_mojo.h" #include "mojo/cc/output_surface_mojo.h"
#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "third_party/WebKit/public/platform/WebLayerTreeView.h" #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
#include "third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom.h"
#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces_service.mojom.h"
namespace base { namespace base {
class MessageLoopProxy; class MessageLoopProxy;
......
# Copyright 2014 The Chromium Authors. All rights reserved. # Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# The absolute path to the directory containing the Mojo services. # The absolute path to the directory containing the Mojo services produced
# out of Chromium.
mojo_services_root = get_path_info("../../..", "abspath") mojo_services_root = get_path_info("../../..", "abspath")
# NOTE: This config name must be in sync with the name of the config used by
# services that developed out of the Mojo repo so that Chromium's services'
# BUILD.gn files can work seamlessly in Chromium and when pulled into Mojo or a
# client repo.
config("mojo_services") { config("mojo_services") {
include_dirs = [ include_dirs = [
# Include paths in Mojo services' client-side code are specified relative # Include paths in Chromium Mojo services' client-side code are specified
# to the directory holding the services' client-side code. # relative to the directory holding the services' client-side code.
mojo_services_root, mojo_services_root,
# The same goes for files generated from mojoms. # The same goes for files generated from mojoms.
......
// Copyright 2014 The Chromium Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# The code in src/ is being canonically developed in the mojo repository;
# please land changes there or they will be blown away by the next sync.
# See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nAwEbgCrUio/73AA2fnfcpEJ
# for more details.
ben@chromium.org
jamesr@chromium.org
Name: MojoServices
Short Name: mojo-services
URL: https://github.com/domokit/mojo
Version: Unknown
Security Critical: Yes
License: Chromium
License Android Compatible: yes
Description:
This codebase contains the client-facing interfaces of services developed in
the Mojo repository.
Local Modifications:
None.
# Copyright 2014 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.
# This variable should point to the parent directory of the Mojo SDK.
mojo_sdk_root = "//third_party/mojo/src"
network_service_root = "//mojo/services"
# Copyright 2014 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.
# The absolute path to the directory containing the Mojo services.
mojo_services_root = get_path_info("../../..", "abspath")
config("mojo_services") {
include_dirs = [
# Include paths in Mojo services' client-side code are specified relative
# to the directory holding the services' client-side code.
mojo_services_root,
# The same goes for files generated from mojoms.
root_gen_dir + mojo_services_root,
]
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment