diff options
22 files changed, 36 insertions, 32 deletions
diff --git a/mojo/apps/js/main.js b/mojo/apps/js/main.js index 6f6fb56..fa90b49 100644 --- a/mojo/apps/js/main.js +++ b/mojo/apps/js/main.js @@ -11,7 +11,7 @@ define([ 'mojo/apps/js/bindings/gl', 'mojo/apps/js/bindings/threading', 'mojo/services/native_viewport/native_viewport.mojom', - 'mojo/public/shell/shell.mojom', + 'mojo/public/interfaces/shell/shell.mojom', ], function(console, monotonicClock, timer, diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index 80b68aa..16a4bce 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -12,9 +12,9 @@ #include "mojo/examples/aura_demo/window_tree_host_mojo.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/cpp/gles2/gles2.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 56a74c5..72398dd 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -11,9 +11,9 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/gles2/gles2.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/geometry_conversions.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/gfx/rect.h" diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc index 34067df..1460fd0 100644 --- a/mojo/examples/launcher/launcher.cc +++ b/mojo/examples/launcher/launcher.cc @@ -18,9 +18,9 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/gles2/gles2.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/default_activation_client.h" diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index 6da28e9..8bd2c14 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -15,9 +15,9 @@ #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/gles2/gles2.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ppapi/c/pp_rect.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc index 38e58aaa..e519f6f 100644 --- a/mojo/examples/sample_app/sample_app.cc +++ b/mojo/examples/sample_app/sample_app.cc @@ -10,11 +10,11 @@ #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/gles2/gles2.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #if defined(WIN32) diff --git a/mojo/examples/view_manager/view_manager.cc b/mojo/examples/view_manager/view_manager.cc index 7560f93..0d366fe 100644 --- a/mojo/examples/view_manager/view_manager.cc +++ b/mojo/examples/view_manager/view_manager.cc @@ -12,9 +12,9 @@ #include "mojo/examples/view_manager/view_manager.mojom.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/geometry_conversions.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/events/event_constants.h" diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi index 47968e4..ff0a809 100644 --- a/mojo/mojo_public.gypi +++ b/mojo/mojo_public.gypi @@ -358,7 +358,7 @@ 'target_name': 'mojo_shell_bindings', 'type': 'static_library', 'sources': [ - 'public/shell/shell.mojom', + 'public/interfaces/shell/shell.mojom', ], 'variables': { 'mojom_base_output_dir': 'mojo', @@ -376,10 +376,10 @@ 'target_name': 'mojo_shell_client', 'type': 'static_library', 'sources': [ - 'public/shell/lib/application.cc', - 'public/shell/lib/service.cc', - 'public/shell/application.h', - 'public/shell/service.h', + 'public/cpp/shell/application.h', + 'public/cpp/shell/service.h', + 'public/cpp/shell/lib/application.cc', + 'public/cpp/shell/lib/service.cc', ], 'dependencies': [ 'mojo_shell_bindings', diff --git a/mojo/public/cpp/shell/DEPS b/mojo/public/cpp/shell/DEPS new file mode 100644 index 0000000..f1a3965 --- /dev/null +++ b/mojo/public/cpp/shell/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+mojo/public/bindings", + "+mojo/public/interfaces/shell", +] diff --git a/mojo/public/shell/application.h b/mojo/public/cpp/shell/application.h index 7896637..dc1de2d 100644 --- a/mojo/public/shell/application.h +++ b/mojo/public/cpp/shell/application.h @@ -8,9 +8,9 @@ #include <vector> #include "mojo/public/bindings/remote_ptr.h" +#include "mojo/public/cpp/shell/service.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/service.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" namespace mojo { diff --git a/mojo/public/shell/lib/application.cc b/mojo/public/cpp/shell/lib/application.cc index 1baff52..4d0b06f 100644 --- a/mojo/public/shell/lib/application.cc +++ b/mojo/public/cpp/shell/lib/application.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/public/shell/application.h" +#include "mojo/public/cpp/shell/application.h" namespace mojo { diff --git a/mojo/public/shell/lib/service.cc b/mojo/public/cpp/shell/lib/service.cc index f638fb2..391a576 100644 --- a/mojo/public/shell/lib/service.cc +++ b/mojo/public/cpp/shell/lib/service.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/public/shell/service.h" +#include "mojo/public/cpp/shell/service.h" namespace mojo { namespace internal { diff --git a/mojo/public/shell/service.h b/mojo/public/cpp/shell/service.h index 100b798..1a08809 100644 --- a/mojo/public/shell/service.h +++ b/mojo/public/cpp/shell/service.h @@ -10,7 +10,7 @@ #include "mojo/public/bindings/error_handler.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" // Utility classes for creating ShellClients that vend service instances. // To use define a class that implements your specific server api, e.g. FooImpl diff --git a/mojo/public/shell/shell.mojom b/mojo/public/interfaces/shell/shell.mojom index 39eae78..39eae78 100644 --- a/mojo/public/shell/shell.mojom +++ b/mojo/public/interfaces/shell/shell.mojom diff --git a/mojo/service_manager/service_loader.h b/mojo/service_manager/service_loader.h index 6d5be9a..42b593e 100644 --- a/mojo/service_manager/service_loader.h +++ b/mojo/service_manager/service_loader.h @@ -5,7 +5,7 @@ #ifndef MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_ #define MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_ -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_manager_export.h" #include "url/gurl.h" diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h index 513c792..f2ee988 100644 --- a/mojo/service_manager/service_manager.h +++ b/mojo/service_manager/service_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_manager_export.h" #include "url/gurl.h" diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc index 18ee25f..01a3626 100644 --- a/mojo/service_manager/service_manager_unittest.cc +++ b/mojo/service_manager/service_manager_unittest.cc @@ -6,8 +6,8 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/environment/environment.h" -#include "mojo/public/shell/application.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/cpp/shell/application.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_loader.h" #include "mojo/service_manager/service_manager.h" #include "mojo/service_manager/test.mojom.h" diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc index fe8729d..2f2576b 100644 --- a/mojo/services/native_viewport/native_viewport_service.cc +++ b/mojo/services/native_viewport/native_viewport_service.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "mojo/public/bindings/allocation_scope.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/gles2/command_buffer_impl.h" #include "mojo/services/native_viewport/geometry_conversions.h" #include "mojo/services/native_viewport/native_viewport.h" diff --git a/mojo/services/native_viewport/native_viewport_service.h b/mojo/services/native_viewport/native_viewport_service.h index 2b7a0be..3f26f94 100644 --- a/mojo/services/native_viewport/native_viewport_service.h +++ b/mojo/services/native_viewport/native_viewport_service.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_vector.h" #include "mojo/public/bindings/remote_ptr.h" -#include "mojo/public/shell/application.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/services/native_viewport/native_viewport_export.h" #include "mojo/shell/context.h" diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc index a6eb580..a912864 100644 --- a/mojo/shell/android/mojo_main.cc +++ b/mojo/shell/android/mojo_main.cc @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "jni/MojoMain_jni.h" -#include "mojo/public/shell/application.h" +#include "mojo/public/cpp/shell/application.h" #include "mojo/service_manager/service_loader.h" #include "mojo/service_manager/service_manager.h" #include "mojo/services/native_viewport/native_viewport_service.h" diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h index 6b8e7dc..456295b 100644 --- a/mojo/shell/dynamic_service_loader.h +++ b/mojo/shell/dynamic_service_loader.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/service_manager/service_loader.h" #include "mojo/shell/dynamic_service_runner.h" #include "mojo/shell/keep_alive.h" diff --git a/mojo/shell/dynamic_service_runner.h b/mojo/shell/dynamic_service_runner.h index 0319531..b61f651 100644 --- a/mojo/shell/dynamic_service_runner.h +++ b/mojo/shell/dynamic_service_runner.h @@ -8,7 +8,7 @@ #include "base/callback_forward.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/public/shell/shell.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" namespace base { class FilePath; |