Move native_viewport and gles2 service impls to //services R=ben@chromium.org Review URL: https://codereview.chromium.org/769173002
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 7dd4c19..68aa297 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn
@@ -118,7 +118,7 @@ "android/javatests/src/org/chromium/mojo/MojoTestCase.java", "android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java", "android/system/src/org/chromium/mojo/system/impl/CoreImpl.java", - "services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java", + "../services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java", ] jni_package = "mojo"
diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn index c045544..e2b29a4 100644 --- a/mojo/android/BUILD.gn +++ b/mojo/android/BUILD.gn
@@ -17,7 +17,7 @@ sources = [ "javatests/src/org/chromium/mojo/MojoTestCase.java", "javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java", - "../services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java", + "../../services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java", "../shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java", ] deps = [ ":system_java_jni_headers" ]
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn index 6c74803..502bde5 100644 --- a/mojo/gles2/BUILD.gn +++ b/mojo/gles2/BUILD.gn
@@ -51,7 +51,7 @@ "//mojo/public/c/system:for_component", "//mojo/public/cpp/bindings", "//mojo/public/cpp/system", - "//mojo/services/gles2:lib", "//mojo/services/public/interfaces/gpu", + "//services/gles2:lib", ] }
diff --git a/mojo/gles2/DEPS b/mojo/gles2/DEPS index db90643..ad09aee 100644 --- a/mojo/gles2/DEPS +++ b/mojo/gles2/DEPS
@@ -2,4 +2,5 @@ "+gpu/command_buffer/client", "+gpu/command_buffer/common", "+gpu/GLES2", + "+services/gles2", ]
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index 09ac862..9e98572 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc
@@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/process/process_handle.h" -#include "mojo/services/gles2/command_buffer_type_conversions.h" -#include "mojo/services/gles2/mojo_buffer_backing.h" +#include "services/gles2/command_buffer_type_conversions.h" +#include "services/gles2/mojo_buffer_backing.h" namespace mojo { namespace gles2 {
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn index ff3206d..77f44ba 100644 --- a/mojo/services/BUILD.gn +++ b/mojo/services/BUILD.gn
@@ -6,7 +6,6 @@ group("services") { deps = [ - "//mojo/services/gles2:lib", "//mojo/services/network", "//mojo/services/public/interfaces/accessibility", "//mojo/services/public/interfaces/clipboard", @@ -20,10 +19,6 @@ "//mojo/services/test_service:bindings", ] - if (!is_android) { - deps += ["//mojo/services/native_viewport"] - } - if (use_aura) { deps += [ "//mojo/services/public/interfaces/view_manager",
diff --git a/mojo/services/gles2/DEPS b/mojo/services/gles2/DEPS deleted file mode 100644 index c5a4bae..0000000 --- a/mojo/services/gles2/DEPS +++ /dev/null
@@ -1,8 +0,0 @@ -include_rules = [ - "+gpu/command_buffer", - "+mojo/converters/geometry", - "+mojo/services/public/interfaces/geometry", - "+mojo/services/public/interfaces/gpu", - "+ui/gfx", - "+ui/gl", -]
diff --git a/mojo/services/native_viewport/DEPS b/mojo/services/native_viewport/DEPS deleted file mode 100644 index c5f6781..0000000 --- a/mojo/services/native_viewport/DEPS +++ /dev/null
@@ -1,20 +0,0 @@ -include_rules = [ - "+cc/surfaces", - "+gpu/command_buffer/service/mailbox_manager_impl.h", - "+mojo/application", - "+mojo/converters/geometry", - "+mojo/converters/input_events", - "+mojo/converters/surfaces", - "+mojo/services/public/cpp/native_viewport", - "+mojo/services/public/cpp/surfaces", - "+mojo/services/public/interfaces/gpu", - "+mojo/services/public/interfaces/native_viewport", - "+mojo/services/public/interfaces/geometry", - "+mojo/services/public/interfaces/surfaces", - "+mojo/services/gles2", - "+ui/events", - "+ui/gfx", - "+ui/gl", - "+ui/ozone/public", - "+ui/platform_window", -]
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index ea159b5..c308251 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn
@@ -165,10 +165,10 @@ deps += [ ":jni_headers", ":run_android_application_function", - "//mojo/services/gles2", - "//mojo/services/native_viewport:lib", - "//mojo/services/network:lib", "//mojo/application:content_handler", + "//mojo/services/network:lib", + "//services/gles2", + "//services/native_viewport:lib", ] } @@ -252,8 +252,8 @@ ":jni_headers", ":lib", "//mojo/application_manager", - "//mojo/services/native_viewport:lib", "//net", + "//services/native_viewport:lib", "//ui/gl", ] } @@ -285,7 +285,7 @@ ":java", ":libmojo_shell", ":resources", - "//mojo/services/native_viewport:native_viewport_java", + "//services/native_viewport:native_viewport_java", ] } }
diff --git a/mojo/shell/android/library_loader.cc b/mojo/shell/android/library_loader.cc index f8af18d..0a00c8e 100644 --- a/mojo/shell/android/library_loader.cc +++ b/mojo/shell/android/library_loader.cc
@@ -7,10 +7,10 @@ #include "base/android/jni_registrar.h" #include "base/android/library_loader/library_loader_hooks.h" #include "base/logging.h" -#include "mojo/services/native_viewport/platform_viewport_android.h" #include "mojo/shell/android/android_handler.h" #include "mojo/shell/android/mojo_main.h" #include "net/android/net_jni_registrar.h" +#include "services/native_viewport/platform_viewport_android.h" namespace {
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc index ff30bcc..0d2c30f 100644 --- a/mojo/shell/context.cc +++ b/mojo/shell/context.cc
@@ -35,10 +35,10 @@ #include "url/gurl.h" #if defined(OS_ANDROID) -#include "mojo/services/gles2/gpu_impl.h" -#include "mojo/services/native_viewport/native_viewport_impl.h" #include "mojo/shell/android/android_handler_loader.h" #include "mojo/shell/network_application_loader.h" +#include "services/gles2/gpu_impl.h" +#include "services/native_viewport/native_viewport_impl.h" #endif // defined(OS_ANDROID) namespace mojo {
diff --git a/services/BUILD.gn b/services/BUILD.gn index 86a29bc..d36750d 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn
@@ -7,6 +7,7 @@ group("services") { deps = [ "//services/clipboard", + "//services/gles2:lib", "//services/http_server", "//services/http_server/public", "//services/js", @@ -14,6 +15,10 @@ "//services/tracing", ] + if (!is_android) { + deps += [ "//services/native_viewport" ] + } + if (use_aura) { deps += [ "//services/view_manager",
diff --git a/mojo/services/gles2/BUILD.gn b/services/gles2/BUILD.gn similarity index 100% rename from mojo/services/gles2/BUILD.gn rename to services/gles2/BUILD.gn
diff --git a/mojo/services/gles2/command_buffer_driver.cc b/services/gles2/command_buffer_driver.cc similarity index 97% rename from mojo/services/gles2/command_buffer_driver.cc rename to services/gles2/command_buffer_driver.cc index f3d5142..ff6bd5e 100644 --- a/mojo/services/gles2/command_buffer_driver.cc +++ b/services/gles2/command_buffer_driver.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/gles2/command_buffer_driver.h" +#include "services/gles2/command_buffer_driver.h" #include "base/bind.h" #include "base/macros.h" @@ -16,8 +16,8 @@ #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/command_buffer/service/memory_tracking.h" #include "gpu/command_buffer/service/sync_point_manager.h" -#include "mojo/services/gles2/command_buffer_type_conversions.h" -#include "mojo/services/gles2/mojo_buffer_backing.h" +#include "services/gles2/command_buffer_type_conversions.h" +#include "services/gles2/mojo_buffer_backing.h" #include "ui/gfx/vsync_provider.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_surface.h"
diff --git a/mojo/services/gles2/command_buffer_driver.h b/services/gles2/command_buffer_driver.h similarity index 95% rename from mojo/services/gles2/command_buffer_driver.h rename to services/gles2/command_buffer_driver.h index 7595647..853b12a 100644 --- a/mojo/services/gles2/command_buffer_driver.h +++ b/services/gles2/command_buffer_driver.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_ -#define MOJO_SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_ +#ifndef SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_ +#define SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_ #include "base/callback.h" #include "base/macros.h" @@ -103,4 +103,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_ +#endif // SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
diff --git a/mojo/services/gles2/command_buffer_impl.cc b/services/gles2/command_buffer_impl.cc similarity index 97% rename from mojo/services/gles2/command_buffer_impl.cc rename to services/gles2/command_buffer_impl.cc index 7180bc3..8cbc59f 100644 --- a/mojo/services/gles2/command_buffer_impl.cc +++ b/services/gles2/command_buffer_impl.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/gles2/command_buffer_impl.h" +#include "services/gles2/command_buffer_impl.h" #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "gpu/command_buffer/service/sync_point_manager.h" -#include "mojo/services/gles2/command_buffer_driver.h" +#include "services/gles2/command_buffer_driver.h" namespace mojo { namespace {
diff --git a/mojo/services/gles2/command_buffer_impl.h b/services/gles2/command_buffer_impl.h similarity index 94% rename from mojo/services/gles2/command_buffer_impl.h rename to services/gles2/command_buffer_impl.h index 0419416..cb69fa2 100644 --- a/mojo/services/gles2/command_buffer_impl.h +++ b/services/gles2/command_buffer_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ -#define MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ +#ifndef SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ +#define SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -67,4 +67,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ +#endif // SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
diff --git a/mojo/services/gles2/command_buffer_type_conversions.cc b/services/gles2/command_buffer_type_conversions.cc similarity index 98% rename from mojo/services/gles2/command_buffer_type_conversions.cc rename to services/gles2/command_buffer_type_conversions.cc index 96b7470..0e5843e 100644 --- a/mojo/services/gles2/command_buffer_type_conversions.cc +++ b/services/gles2/command_buffer_type_conversions.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/gles2/command_buffer_type_conversions.h" +#include "services/gles2/command_buffer_type_conversions.h" #include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
diff --git a/mojo/services/gles2/command_buffer_type_conversions.h b/services/gles2/command_buffer_type_conversions.h similarity index 90% rename from mojo/services/gles2/command_buffer_type_conversions.h rename to services/gles2/command_buffer_type_conversions.h index 883855e..fc0b49b 100644 --- a/mojo/services/gles2/command_buffer_type_conversions.h +++ b/services/gles2/command_buffer_type_conversions.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_ -#define MOJO_SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_ +#ifndef SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_ +#define SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_ #include "gpu/command_buffer/common/capabilities.h" #include "gpu/command_buffer/common/command_buffer.h" @@ -64,4 +64,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_ +#endif // SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
diff --git a/mojo/services/gles2/gpu_impl.cc b/services/gles2/gpu_impl.cc similarity index 93% rename from mojo/services/gles2/gpu_impl.cc rename to services/gles2/gpu_impl.cc index 13d5b7f..6cbc48f 100644 --- a/mojo/services/gles2/gpu_impl.cc +++ b/services/gles2/gpu_impl.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/gles2/gpu_impl.h" +#include "services/gles2/gpu_impl.h" #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/command_buffer/service/mailbox_manager_impl.h" #include "gpu/command_buffer/service/sync_point_manager.h" #include "mojo/converters/geometry/geometry_type_converters.h" -#include "mojo/services/gles2/command_buffer_driver.h" -#include "mojo/services/gles2/command_buffer_impl.h" +#include "services/gles2/command_buffer_driver.h" +#include "services/gles2/command_buffer_impl.h" #include "ui/gl/gl_share_group.h" #include "ui/gl/gl_surface.h"
diff --git a/mojo/services/gles2/gpu_impl.h b/services/gles2/gpu_impl.h similarity index 95% rename from mojo/services/gles2/gpu_impl.h rename to services/gles2/gpu_impl.h index a7c432f..905c108 100644 --- a/mojo/services/gles2/gpu_impl.h +++ b/services/gles2/gpu_impl.h
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef SERVICES_GLES2_GPU_IMPL_H_ +#define SERVICES_GLES2_GPU_IMPL_H_ + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread.h" @@ -79,3 +82,5 @@ }; } // namespace mojo + +#endif // SERVICES_GLES2_GPU_IMPL_H_
diff --git a/mojo/services/gles2/mojo_buffer_backing.cc b/services/gles2/mojo_buffer_backing.cc similarity index 95% rename from mojo/services/gles2/mojo_buffer_backing.cc rename to services/gles2/mojo_buffer_backing.cc index 3c90878..bfe3a2d 100644 --- a/mojo/services/gles2/mojo_buffer_backing.cc +++ b/services/gles2/mojo_buffer_backing.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/gles2/mojo_buffer_backing.h" +#include "services/gles2/mojo_buffer_backing.h" #include "base/logging.h"
diff --git a/mojo/services/gles2/mojo_buffer_backing.h b/services/gles2/mojo_buffer_backing.h similarity index 85% rename from mojo/services/gles2/mojo_buffer_backing.h rename to services/gles2/mojo_buffer_backing.h index 079e98e..bc108b5 100644 --- a/mojo/services/gles2/mojo_buffer_backing.h +++ b/services/gles2/mojo_buffer_backing.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_GLES2_MOJO_BUFFER_BACKING_H_ -#define MOJO_SERVICES_GLES2_MOJO_BUFFER_BACKING_H_ +#ifndef SERVICES_GLES2_MOJO_BUFFER_BACKING_H_ +#define SERVICES_GLES2_MOJO_BUFFER_BACKING_H_ #include "base/macros.h" #include "base/memory/scoped_ptr.h" @@ -38,4 +38,4 @@ } // namespace gles2 } // namespace mojo -#endif // MOJO_SERVICES_GLES2_MOJO_BUFFER_BACKING_H_ +#endif // SERVICES_GLES2_MOJO_BUFFER_BACKING_H_
diff --git a/mojo/services/native_viewport/BUILD.gn b/services/native_viewport/BUILD.gn similarity index 97% rename from mojo/services/native_viewport/BUILD.gn rename to services/native_viewport/BUILD.gn index baf999d..039cb0a 100644 --- a/mojo/services/native_viewport/BUILD.gn +++ b/services/native_viewport/BUILD.gn
@@ -29,9 +29,9 @@ "//mojo/common:tracing_impl", "//mojo/public/c/system:for_shared_library", "//mojo/public/cpp/bindings:bindings", - "//mojo/services/gles2:gles2", "//mojo/services/public/interfaces/native_viewport", "//mojo/services/public/cpp/native_viewport:args", + "//services/gles2", "//ui/gl", ] } @@ -73,7 +73,7 @@ "//mojo/converters/input_events", "//mojo/converters/surfaces", "//mojo/environment:chromium", - "//mojo/services/gles2", + "//services/gles2", "//mojo/services/public/cpp/surfaces", "//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/gpu",
diff --git a/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java b/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java similarity index 100% rename from mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java rename to services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
diff --git a/mojo/services/native_viewport/main.cc b/services/native_viewport/main.cc similarity index 95% rename from mojo/services/native_viewport/main.cc rename to services/native_viewport/main.cc index 1a71ccd..f003070 100644 --- a/mojo/services/native_viewport/main.cc +++ b/services/native_viewport/main.cc
@@ -11,9 +11,9 @@ #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/gles2/gpu_impl.h" -#include "mojo/services/native_viewport/native_viewport_impl.h" #include "mojo/services/public/cpp/native_viewport/args.h" +#include "services/gles2/gpu_impl.h" +#include "services/native_viewport/native_viewport_impl.h" #include "ui/gl/gl_surface.h" namespace mojo {
diff --git a/mojo/services/native_viewport/native_viewport_impl.cc b/services/native_viewport/native_viewport_impl.cc similarity index 96% rename from mojo/services/native_viewport/native_viewport_impl.cc rename to services/native_viewport/native_viewport_impl.cc index d6c39d5..1ccdff4 100644 --- a/mojo/services/native_viewport/native_viewport_impl.cc +++ b/services/native_viewport/native_viewport_impl.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/native_viewport_impl.h" +#include "services/native_viewport/native_viewport_impl.h" #include "base/auto_reset.h" #include "base/bind.h" @@ -15,8 +15,8 @@ #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/services/native_viewport/platform_viewport_headless.h" -#include "mojo/services/native_viewport/viewport_surface.h" +#include "services/native_viewport/platform_viewport_headless.h" +#include "services/native_viewport/viewport_surface.h" #include "ui/events/event.h" namespace mojo {
diff --git a/mojo/services/native_viewport/native_viewport_impl.h b/services/native_viewport/native_viewport_impl.h similarity index 89% rename from mojo/services/native_viewport/native_viewport_impl.h rename to services/native_viewport/native_viewport_impl.h index e0e37a9..6478819 100644 --- a/mojo/services/native_viewport/native_viewport_impl.h +++ b/services/native_viewport/native_viewport_impl.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_ -#define MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_ +#ifndef SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_IMPL_H_ +#define SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_IMPL_H_ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "cc/surfaces/surface_id.h" -#include "mojo/services/native_viewport/platform_viewport.h" #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h" #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h" +#include "services/native_viewport/platform_viewport.h" #include "ui/gfx/geometry/rect.h" namespace ui { @@ -66,4 +66,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_ +#endif // SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_IMPL_H_
diff --git a/mojo/services/native_viewport/platform_viewport.h b/services/native_viewport/platform_viewport.h similarity index 86% rename from mojo/services/native_viewport/platform_viewport.h rename to services/native_viewport/platform_viewport.h index a3ba3dc..eb55b0e 100644 --- a/mojo/services/native_viewport/platform_viewport.h +++ b/services/native_viewport/platform_viewport.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_ -#define MOJO_SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_ +#ifndef SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_ +#define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_ #include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h" @@ -50,4 +50,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_ +#endif // SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_
diff --git a/mojo/services/native_viewport/platform_viewport_android.cc b/services/native_viewport/platform_viewport_android.cc similarity index 98% rename from mojo/services/native_viewport/platform_viewport_android.cc rename to services/native_viewport/platform_viewport_android.cc index bbe22c9..baa4f08 100644 --- a/mojo/services/native_viewport/platform_viewport_android.cc +++ b/services/native_viewport/platform_viewport_android.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport_android.h" +#include "services/native_viewport/platform_viewport_android.h" #include <android/input.h> #include <android/native_window_jni.h>
diff --git a/mojo/services/native_viewport/platform_viewport_android.h b/services/native_viewport/platform_viewport_android.h similarity index 86% rename from mojo/services/native_viewport/platform_viewport_android.h rename to services/native_viewport/platform_viewport_android.h index 31b0312..443ac67 100644 --- a/mojo/services/native_viewport/platform_viewport_android.h +++ b/services/native_viewport/platform_viewport_android.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ -#define MOJO_SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ +#ifndef SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ +#define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "mojo/services/native_viewport/platform_viewport.h" +#include "services/native_viewport/platform_viewport.h" #include "ui/events/event_constants.h" #include "ui/gfx/rect.h" #include "ui/gfx/sequential_id_generator.h" @@ -63,4 +63,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ +#endif // SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
diff --git a/mojo/services/native_viewport/platform_viewport_headless.cc b/services/native_viewport/platform_viewport_headless.cc similarity index 93% rename from mojo/services/native_viewport/platform_viewport_headless.cc rename to services/native_viewport/platform_viewport_headless.cc index 1c34711..0d057eb 100644 --- a/mojo/services/native_viewport/platform_viewport_headless.cc +++ b/services/native_viewport/platform_viewport_headless.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport_headless.h" +#include "services/native_viewport/platform_viewport_headless.h" namespace mojo {
diff --git a/mojo/services/native_viewport/platform_viewport_headless.h b/services/native_viewport/platform_viewport_headless.h similarity index 78% rename from mojo/services/native_viewport/platform_viewport_headless.h rename to services/native_viewport/platform_viewport_headless.h index ba2a5b1..5061793 100644 --- a/mojo/services/native_viewport/platform_viewport_headless.h +++ b/services/native_viewport/platform_viewport_headless.h
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_HEADLESS_H_ +#define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_HEADLESS_H_ + #include "base/macros.h" -#include "mojo/services/native_viewport/platform_viewport.h" +#include "services/native_viewport/platform_viewport.h" #include "ui/gfx/rect.h" namespace mojo { @@ -34,3 +37,5 @@ }; } // namespace mojo + +#endif // SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_HEADLESS_H_
diff --git a/mojo/services/native_viewport/platform_viewport_mac.mm b/services/native_viewport/platform_viewport_mac.mm similarity index 96% rename from mojo/services/native_viewport/platform_viewport_mac.mm rename to services/native_viewport/platform_viewport_mac.mm index a74b6ba..600443b 100644 --- a/mojo/services/native_viewport/platform_viewport_mac.mm +++ b/services/native_viewport/platform_viewport_mac.mm
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport.h" +#include "services/native_viewport/platform_viewport.h" #import <AppKit/NSApplication.h> #import <AppKit/NSView.h>
diff --git a/mojo/services/native_viewport/platform_viewport_ozone.cc b/services/native_viewport/platform_viewport_ozone.cc similarity index 97% rename from mojo/services/native_viewport/platform_viewport_ozone.cc rename to services/native_viewport/platform_viewport_ozone.cc index dcac5ad..5419891 100644 --- a/mojo/services/native_viewport/platform_viewport_ozone.cc +++ b/services/native_viewport/platform_viewport_ozone.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport.h" +#include "services/native_viewport/platform_viewport.h" #include "ui/events/event.h" #include "ui/events/platform/platform_event_dispatcher.h"
diff --git a/mojo/services/native_viewport/platform_viewport_stub.cc b/services/native_viewport/platform_viewport_stub.cc similarity index 83% rename from mojo/services/native_viewport/platform_viewport_stub.cc rename to services/native_viewport/platform_viewport_stub.cc index 80a7e94..008abb5 100644 --- a/mojo/services/native_viewport/platform_viewport_stub.cc +++ b/services/native_viewport/platform_viewport_stub.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport_headless.h" +#include "services/native_viewport/platform_viewport_headless.h" namespace mojo {
diff --git a/mojo/services/native_viewport/platform_viewport_win.cc b/services/native_viewport/platform_viewport_win.cc similarity index 97% rename from mojo/services/native_viewport/platform_viewport_win.cc rename to services/native_viewport/platform_viewport_win.cc index 91c980c..e66efb0 100644 --- a/mojo/services/native_viewport/platform_viewport_win.cc +++ b/services/native_viewport/platform_viewport_win.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport.h" +#include "services/native_viewport/platform_viewport.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/rect.h"
diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/services/native_viewport/platform_viewport_x11.cc similarity index 98% rename from mojo/services/native_viewport/platform_viewport_x11.cc rename to services/native_viewport/platform_viewport_x11.cc index 099b31c..cacdcdf 100644 --- a/mojo/services/native_viewport/platform_viewport_x11.cc +++ b/services/native_viewport/platform_viewport_x11.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/platform_viewport.h" +#include "services/native_viewport/platform_viewport.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h"
diff --git a/mojo/services/native_viewport/viewport_surface.cc b/services/native_viewport/viewport_surface.cc similarity index 98% rename from mojo/services/native_viewport/viewport_surface.cc rename to services/native_viewport/viewport_surface.cc index 96ed083..2130fba 100644 --- a/mojo/services/native_viewport/viewport_surface.cc +++ b/services/native_viewport/viewport_surface.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/services/native_viewport/viewport_surface.h" +#include "services/native_viewport/viewport_surface.h" #include "base/bind.h" #include "cc/surfaces/surface_id_allocator.h"
diff --git a/mojo/services/native_viewport/viewport_surface.h b/services/native_viewport/viewport_surface.h similarity index 90% rename from mojo/services/native_viewport/viewport_surface.h rename to services/native_viewport/viewport_surface.h index 9fc4260..746217c 100644 --- a/mojo/services/native_viewport/viewport_surface.h +++ b/services/native_viewport/viewport_surface.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ -#define MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ +#ifndef SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ +#define SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -55,4 +55,4 @@ } // namespace mojo -#endif // MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ +#endif // SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_