diff options
Diffstat (limited to 'components/html_viewer')
21 files changed, 42 insertions, 42 deletions
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index e4c270f..a6cff06 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -171,8 +171,6 @@ source_set("lib") { "//media:shared_memory_support", "//media/blink", "//media/mojo", - "//mojo/application/public/cpp", - "//mojo/application/public/interfaces", "//mojo/common", "//mojo/converters/blink", "//mojo/converters/surfaces", @@ -187,6 +185,8 @@ source_set("lib") { "//mojo/services/network/public/interfaces", "//mojo/services/tracing/public/cpp", "//mojo/services/tracing/public/interfaces", + "//mojo/shell/public/cpp", + "//mojo/shell/public/interfaces", "//net", "//skia", "//third_party/WebKit/public:image_resources", @@ -238,7 +238,7 @@ mojo_native_application("html_viewer") { ":lib", ":pak", "//base", - "//mojo/application/public/cpp:sources", + "//mojo/shell/public/cpp:sources", ] resources = [ "$root_out_dir/html_viewer.pak" ] @@ -270,8 +270,8 @@ mojo_native_application("layout_test_html_viewer") { "//cc", "//components/test_runner", "//components/web_view/test_runner/public/interfaces", - "//mojo/application/public/cpp:sources", "//mojo/public/c/system:for_shared_library", + "//mojo/shell/public/cpp:sources", "//third_party/WebKit/public:blink", "//third_party/WebKit/public:test_support", "//ui/base", @@ -352,11 +352,11 @@ mojo_native_application("apptests") { "//components/web_view:lib", "//components/web_view:test_support", "//components/web_view/public/interfaces", - "//mojo/application/public/cpp:sources", - "//mojo/application/public/cpp:test_support", "//mojo/converters/network", "//mojo/public/c/system:for_shared_library", "//mojo/services/accessibility/public/interfaces", + "//mojo/shell/public/cpp:sources", + "//mojo/shell/public/cpp:test_support", "//net:test_support", "//testing/gtest", ] diff --git a/components/html_viewer/DEPS b/components/html_viewer/DEPS index 6b44e1f..43b66df 100644 --- a/components/html_viewer/DEPS +++ b/components/html_viewer/DEPS @@ -21,7 +21,7 @@ include_rules = [ "+gpu/command_buffer/common/gles2_cmd_utils.h", "+mandoline/services", "+media", - "+mojo/application", + "+mojo/shell", "+mojo/cc", "+mojo/common", "+mojo/converters/blink", diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc index a8cd4e2..44ce4d6 100644 --- a/components/html_viewer/ax_provider_apptest.cc +++ b/components/html_viewer/ax_provider_apptest.cc @@ -17,10 +17,10 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "components/web_view/public/interfaces/frame.mojom.h" -#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/application/public/cpp/application_test_base.h" #include "mojo/converters/network/network_type_converters.h" #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/application_test_base.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/html_viewer/blink_platform_impl.cc b/components/html_viewer/blink_platform_impl.cc index d8d7812..5127bbe 100644 --- a/components/html_viewer/blink_platform_impl.cc +++ b/components/html_viewer/blink_platform_impl.cc @@ -27,9 +27,9 @@ #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h" -#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/application/public/cpp/connect.h" #include "mojo/common/user_agent.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/connect.h" #include "net/base/data_url.h" #include "net/base/ip_address_number.h" #include "net/base/net_errors.h" diff --git a/components/html_viewer/content_handler_impl.h b/components/html_viewer/content_handler_impl.h index 50a48d7..7aa8996 100644 --- a/components/html_viewer/content_handler_impl.h +++ b/components/html_viewer/content_handler_impl.h @@ -6,9 +6,9 @@ #define COMPONENTS_HTML_VIEWER_CONTENT_HANDLER_IMPL_H_ #include "base/macros.h" -#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/application/public/interfaces/content_handler.mojom.h" #include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/interfaces/content_handler.mojom.h" namespace html_viewer { diff --git a/components/html_viewer/global_state.cc b/components/html_viewer/global_state.cc index 5b4999e..5410fa6 100644 --- a/components/html_viewer/global_state.cc +++ b/components/html_viewer/global_state.cc @@ -19,9 +19,9 @@ #include "components/html_viewer/media_factory.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "gin/v8_initializer.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/logging/init_logging.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc index 3da8c5d..ac2cb21 100644 --- a/components/html_viewer/html_document.cc +++ b/components/html_viewer/html_document.cc @@ -25,11 +25,11 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/ws/ids.h" -#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/application/public/cpp/connect.h" -#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/cpp/system/data_pipe.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/connect.h" +#include "mojo/shell/public/interfaces/shell.mojom.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/size.h" diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h index 8b7aee2..2eb5d6e 100644 --- a/components/html_viewer/html_document.h +++ b/components/html_viewer/html_document.h @@ -17,11 +17,11 @@ #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h" #include "components/mus/public/cpp/window_tree_delegate.h" #include "components/web_view/public/interfaces/frame.mojom.h" -#include "mojo/application/public/cpp/app_lifetime_helper.h" -#include "mojo/application/public/cpp/interface_factory.h" -#include "mojo/application/public/cpp/service_provider_impl.h" -#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" +#include "mojo/shell/public/cpp/app_lifetime_helper.h" +#include "mojo/shell/public/cpp/interface_factory.h" +#include "mojo/shell/public/cpp/service_provider_impl.h" +#include "mojo/shell/public/interfaces/application.mojom.h" namespace base { class SingleThreadTaskRunner; diff --git a/components/html_viewer/html_document_application_delegate.cc b/components/html_viewer/html_document_application_delegate.cc index 79c2834..028ea24 100644 --- a/components/html_viewer/html_document_application_delegate.cc +++ b/components/html_viewer/html_document_application_delegate.cc @@ -10,9 +10,9 @@ #include "base/macros.h" #include "components/html_viewer/global_state.h" #include "components/html_viewer/html_document.h" -#include "mojo/application/public/cpp/application_connection.h" -#include "mojo/application/public/cpp/application_delegate.h" -#include "mojo/application/public/cpp/connect.h" +#include "mojo/shell/public/cpp/application_connection.h" +#include "mojo/shell/public/cpp/application_delegate.h" +#include "mojo/shell/public/cpp/connect.h" namespace html_viewer { diff --git a/components/html_viewer/html_document_application_delegate.h b/components/html_viewer/html_document_application_delegate.h index 6a1676e..a2264cb 100644 --- a/components/html_viewer/html_document_application_delegate.h +++ b/components/html_viewer/html_document_application_delegate.h @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "components/html_viewer/html_factory.h" -#include "mojo/application/public/cpp/application_delegate.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" +#include "mojo/shell/public/cpp/application_delegate.h" +#include "mojo/shell/public/cpp/application_impl.h" namespace html_viewer { diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc index 3365852..22f3ca9 100644 --- a/components/html_viewer/html_frame.cc +++ b/components/html_viewer/html_frame.cc @@ -39,12 +39,12 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/ws/ids.h" -#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/application/public/cpp/connect.h" -#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/common/common_type_converters.h" #include "mojo/converters/blink/blink_input_events_type_converters.h" #include "mojo/converters/geometry/geometry_type_converters.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/connect.h" +#include "mojo/shell/public/interfaces/shell.mojom.h" #include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc index f887ef3..1b1829b 100644 --- a/components/html_viewer/html_frame_apptest.cc +++ b/components/html_viewer/html_frame_apptest.cc @@ -27,8 +27,8 @@ #include "components/web_view/frame_tree.h" #include "components/web_view/public/interfaces/frame.mojom.h" #include "components/web_view/test_frame_tree_delegate.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "net/test/embedded_test_server/embedded_test_server.h" using mus::mojom::WindowTreeClientPtr; diff --git a/components/html_viewer/html_viewer.cc b/components/html_viewer/html_viewer.cc index 8d541d5..a8616ba 100644 --- a/components/html_viewer/html_viewer.cc +++ b/components/html_viewer/html_viewer.cc @@ -8,7 +8,7 @@ #include "components/html_viewer/content_handler_impl.h" #include "components/html_viewer/global_state.h" -#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/shell/public/cpp/application_connection.h" namespace html_viewer { diff --git a/components/html_viewer/html_viewer.h b/components/html_viewer/html_viewer.h index ba8af6a..59563ea 100644 --- a/components/html_viewer/html_viewer.h +++ b/components/html_viewer/html_viewer.h @@ -7,9 +7,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/application/public/cpp/application_delegate.h" -#include "mojo/application/public/cpp/interface_factory_impl.h" -#include "mojo/application/public/interfaces/content_handler.mojom.h" +#include "mojo/shell/public/cpp/application_delegate.h" +#include "mojo/shell/public/cpp/interface_factory_impl.h" +#include "mojo/shell/public/interfaces/content_handler.mojom.h" namespace html_viewer { diff --git a/components/html_viewer/html_viewer_main.cc b/components/html_viewer/html_viewer_main.cc index c256530..cb03407 100644 --- a/components/html_viewer/html_viewer_main.cc +++ b/components/html_viewer/html_viewer_main.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "components/html_viewer/html_viewer.h" -#include "mojo/application/public/cpp/application_runner.h" #include "mojo/public/c/system/main.h" +#include "mojo/shell/public/cpp/application_runner.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new html_viewer::HTMLViewer); diff --git a/components/html_viewer/html_widget.cc b/components/html_viewer/html_widget.cc index 21ac280..0ffd991 100644 --- a/components/html_viewer/html_widget.cc +++ b/components/html_viewer/html_widget.cc @@ -15,8 +15,8 @@ #include "components/html_viewer/web_layer_tree_view_impl.h" #include "components/html_viewer/web_storage_namespace_impl.h" #include "components/mus/public/cpp/window.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "third_party/WebKit/public/web/WebFrameWidget.h" #include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/WebKit/public/web/WebView.h" diff --git a/components/html_viewer/layout_test_html_viewer_main.cc b/components/html_viewer/layout_test_html_viewer_main.cc index 08186ce..2a56ac9 100644 --- a/components/html_viewer/layout_test_html_viewer_main.cc +++ b/components/html_viewer/layout_test_html_viewer_main.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "components/html_viewer/layout_test_html_viewer.h" -#include "mojo/application/public/cpp/application_runner.h" #include "mojo/public/c/system/main.h" +#include "mojo/shell/public/cpp/application_runner.h" MojoResult MojoMain(MojoHandle shell_handle) { mojo::ApplicationRunner runner(new html_viewer::LayoutTestHTMLViewer); diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc index 613ac61..dda9427 100644 --- a/components/html_viewer/media_factory.cc +++ b/components/html_viewer/media_factory.cc @@ -29,8 +29,8 @@ #include "media/mojo/services/mojo_renderer_factory.h" #include "media/renderers/default_renderer_factory.h" #include "media/renderers/gpu_video_accelerator_factories.h" -#include "mojo/application/public/cpp/connect.h" -#include "mojo/application/public/interfaces/shell.mojom.h" +#include "mojo/shell/public/cpp/connect.h" +#include "mojo/shell/public/interfaces/shell.mojom.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "v8/include/v8.h" diff --git a/components/html_viewer/media_factory.h b/components/html_viewer/media_factory.h index 031e4c9..dc486f4 100644 --- a/components/html_viewer/media_factory.h +++ b/components/html_viewer/media_factory.h @@ -15,7 +15,7 @@ #include "media/base/audio_hardware_config.h" #include "media/blink/url_index.h" #include "media/mojo/interfaces/service_factory.mojom.h" -#include "mojo/application/public/interfaces/service_provider.mojom.h" +#include "mojo/shell/public/interfaces/service_provider.mojom.h" namespace base { class SingleThreadTaskRunner; diff --git a/components/html_viewer/stats_collection_controller.cc b/components/html_viewer/stats_collection_controller.cc index 9205027..a234459 100644 --- a/components/html_viewer/stats_collection_controller.cc +++ b/components/html_viewer/stats_collection_controller.cc @@ -14,8 +14,8 @@ #include "components/startup_metric_utils/browser/startup_metric_utils.h" #include "gin/handle.h" #include "gin/object_template_builder.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/services/tracing/public/cpp/switches.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" diff --git a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc index c4f7a6b..f927610 100644 --- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc +++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc @@ -11,11 +11,11 @@ #include "components/mus/public/cpp/context_provider.h" #include "components/mus/public/interfaces/gpu.mojom.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" -#include "mojo/application/public/cpp/application_impl.h" #include "mojo/gles2/gles2_context.h" #include "mojo/gpu/mojo_gles2_impl_autogen.h" #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/message_pipe.h" +#include "mojo/shell/public/cpp/application_impl.h" namespace html_viewer { |