From fa1aad5df7c5525fda1827361e5219a9f71481c9 Mon Sep 17 00:00:00 2001 From: George Wright Date: Thu, 4 Feb 2021 12:29:18 -0800 Subject: [PATCH 1/2] Move shell/platform/common/cpp to shell/platform/common --- BUILD.gn | 6 +- ci/licenses_golden/licenses_flutter | 142 +++++++++--------- shell/platform/common/{cpp => }/BUILD.gn | 6 +- .../common/{cpp => }/accessibility_bridge.cc | 0 .../common/{cpp => }/accessibility_bridge.h | 0 .../accessibility_bridge_unittests.cc | 0 .../common/{cpp => }/client_wrapper/BUILD.gn | 8 +- .../common/{cpp => }/client_wrapper/README | 0 .../basic_message_channel_unittests.cc | 6 +- .../client_wrapper/binary_messenger_impl.h | 0 .../client_wrapper/byte_buffer_streams.h | 0 .../client_wrapper/core_implementations.cc | 0 .../client_wrapper/core_wrapper_files.gni | 0 .../encodable_value_unittests.cc | 2 +- .../client_wrapper/engine_method_result.cc | 0 .../client_wrapper/event_channel_unittests.cc | 8 +- .../include/flutter/basic_message_channel.h | 0 .../include/flutter/binary_messenger.h | 0 .../include/flutter/byte_streams.h | 0 .../include/flutter/encodable_value.h | 0 .../include/flutter/engine_method_result.h | 0 .../include/flutter/event_channel.h | 0 .../include/flutter/event_sink.h | 0 .../include/flutter/event_stream_handler.h | 0 .../flutter/event_stream_handler_functions.h | 0 .../include/flutter/message_codec.h | 0 .../include/flutter/method_call.h | 0 .../include/flutter/method_channel.h | 0 .../include/flutter/method_codec.h | 0 .../include/flutter/method_result.h | 0 .../include/flutter/method_result_functions.h | 0 .../include/flutter/plugin_registrar.h | 0 .../include/flutter/plugin_registry.h | 0 .../flutter/standard_codec_serializer.h | 0 .../include/flutter/standard_message_codec.h | 0 .../include/flutter/standard_method_codec.h | 0 .../include/flutter/texture_registrar.h | 0 .../client_wrapper/method_call_unittests.cc | 2 +- .../method_channel_unittests.cc | 8 +- .../method_result_functions_unittests.cc | 2 +- .../client_wrapper/plugin_registrar.cc | 0 .../plugin_registrar_unittests.cc | 4 +- .../{cpp => }/client_wrapper/publish.gni | 0 .../client_wrapper/standard_codec.cc | 0 .../standard_message_codec_unittests.cc | 4 +- .../standard_method_codec_unittests.cc | 6 +- .../testing/stub_flutter_api.cc | 2 +- .../client_wrapper/testing/stub_flutter_api.h | 6 +- .../testing/test_codec_extensions.cc | 2 +- .../testing/test_codec_extensions.h | 4 +- .../client_wrapper/texture_registrar_impl.h | 0 .../texture_registrar_unittests.cc | 6 +- .../common/{cpp => }/engine_switches.cc | 2 +- .../common/{cpp => }/engine_switches.h | 0 .../{cpp => }/engine_switches_unittests.cc | 2 +- .../flutter_platform_node_delegate.cc | 0 .../flutter_platform_node_delegate.h | 0 ...lutter_platform_node_delegate_unittests.cc | 0 shell/platform/common/{cpp => }/geometry.h | 0 .../common/{cpp => }/geometry_unittests.cc | 2 +- .../{cpp => }/incoming_message_dispatcher.cc | 2 +- .../{cpp => }/incoming_message_dispatcher.h | 2 +- .../common/{cpp => }/json_message_codec.cc | 2 +- .../common/{cpp => }/json_message_codec.h | 2 +- .../{cpp => }/json_message_codec_unittests.cc | 2 +- .../common/{cpp => }/json_method_codec.cc | 4 +- .../common/{cpp => }/json_method_codec.h | 4 +- .../{cpp => }/json_method_codec_unittests.cc | 4 +- shell/platform/common/{cpp => }/path_utils.cc | 2 +- shell/platform/common/{cpp => }/path_utils.h | 0 .../common/{cpp => }/path_utils_unittests.cc | 2 +- .../common/{cpp => }/public/flutter_export.h | 0 .../{cpp => }/public/flutter_messenger.h | 0 .../public/flutter_plugin_registrar.h | 0 .../public/flutter_texture_registrar.h | 0 .../{cpp => }/test_accessibility_bridge.cc | 0 .../{cpp => }/test_accessibility_bridge.h | 0 .../common/{cpp => }/text_input_model.cc | 2 +- .../common/{cpp => }/text_input_model.h | 2 +- .../{cpp => }/text_input_model_unittests.cc | 2 +- shell/platform/common/{cpp => }/text_range.h | 0 .../common/{cpp => }/text_range_unittests.cc | 2 +- shell/platform/darwin/macos/BUILD.gn | 2 +- .../framework/Source/FlutterDartProject.mm | 2 +- shell/platform/fuchsia/flutter/BUILD.gn | 2 +- .../platform/fuchsia/flutter/platform_view.cc | 4 +- shell/platform/glfw/BUILD.gn | 16 +- shell/platform/glfw/client_wrapper/BUILD.gn | 14 +- shell/platform/glfw/flutter_glfw.cc | 6 +- shell/platform/glfw/key_event_handler.cc | 2 +- shell/platform/glfw/key_event_handler.h | 4 +- shell/platform/glfw/platform_handler.cc | 2 +- shell/platform/glfw/platform_handler.h | 4 +- shell/platform/glfw/text_input_plugin.cc | 2 +- shell/platform/glfw/text_input_plugin.h | 6 +- shell/platform/linux/BUILD.gn | 4 +- shell/platform/linux/fl_dart_project.cc | 2 +- shell/platform/linux/fl_text_input_plugin.cc | 2 +- shell/platform/windows/BUILD.gn | 22 +-- .../platform/windows/client_wrapper/BUILD.gn | 16 +- shell/platform/windows/cursor_handler.cc | 2 +- shell/platform/windows/cursor_handler.h | 6 +- shell/platform/windows/external_texture_gl.h | 2 +- .../windows/flutter_project_bundle.cc | 4 +- shell/platform/windows/flutter_windows.cc | 6 +- .../windows/flutter_windows_engine.cc | 8 +- .../platform/windows/flutter_windows_engine.h | 6 +- shell/platform/windows/flutter_windows_view.h | 4 +- .../windows/flutter_windows_winuwp.cc | 4 +- shell/platform/windows/key_event_handler.cc | 2 +- shell/platform/windows/key_event_handler.h | 4 +- .../windows/key_event_handler_unittests.cc | 2 +- shell/platform/windows/platform_handler.cc | 2 +- shell/platform/windows/platform_handler.h | 4 +- .../windows/platform_handler_unittests.cc | 4 +- .../platform/windows/platform_handler_win32.h | 4 +- .../windows/platform_handler_winuwp.h | 4 +- .../windows/testing/test_binary_messenger.h | 2 +- .../windows/text_input_manager_win32.h | 2 +- shell/platform/windows/text_input_plugin.cc | 2 +- shell/platform/windows/text_input_plugin.h | 10 +- .../windows/text_input_plugin_delegate.h | 2 +- shell/platform/windows/win32_flutter_window.h | 2 +- .../windows/win32_flutter_window_unittests.cc | 2 +- .../platform/windows/window_binding_handler.h | 2 +- .../windows/window_binding_handler_delegate.h | 2 +- shell/platform/windows/window_state.h | 4 +- 127 files changed, 237 insertions(+), 237 deletions(-) rename shell/platform/common/{cpp => }/BUILD.gn (95%) rename shell/platform/common/{cpp => }/accessibility_bridge.cc (100%) rename shell/platform/common/{cpp => }/accessibility_bridge.h (100%) rename shell/platform/common/{cpp => }/accessibility_bridge_unittests.cc (100%) rename shell/platform/common/{cpp => }/client_wrapper/BUILD.gn (84%) rename shell/platform/common/{cpp => }/client_wrapper/README (100%) rename shell/platform/common/{cpp => }/client_wrapper/basic_message_channel_unittests.cc (90%) rename shell/platform/common/{cpp => }/client_wrapper/binary_messenger_impl.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/byte_buffer_streams.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/core_implementations.cc (100%) rename shell/platform/common/{cpp => }/client_wrapper/core_wrapper_files.gni (100%) rename shell/platform/common/{cpp => }/client_wrapper/encodable_value_unittests.cc (98%) rename shell/platform/common/{cpp => }/client_wrapper/engine_method_result.cc (100%) rename shell/platform/common/{cpp => }/client_wrapper/event_channel_unittests.cc (94%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/basic_message_channel.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/binary_messenger.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/byte_streams.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/encodable_value.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/engine_method_result.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/event_channel.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/event_sink.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/event_stream_handler.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/event_stream_handler_functions.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/message_codec.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/method_call.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/method_channel.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/method_codec.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/method_result.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/method_result_functions.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/plugin_registrar.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/plugin_registry.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/standard_codec_serializer.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/standard_message_codec.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/standard_method_codec.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/include/flutter/texture_registrar.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/method_call_unittests.cc (86%) rename shell/platform/common/{cpp => }/client_wrapper/method_channel_unittests.cc (93%) rename shell/platform/common/{cpp => }/client_wrapper/method_result_functions_unittests.cc (94%) rename shell/platform/common/{cpp => }/client_wrapper/plugin_registrar.cc (100%) rename shell/platform/common/{cpp => }/client_wrapper/plugin_registrar_unittests.cc (97%) rename shell/platform/common/{cpp => }/client_wrapper/publish.gni (100%) rename shell/platform/common/{cpp => }/client_wrapper/standard_codec.cc (100%) rename shell/platform/common/{cpp => }/client_wrapper/standard_message_codec_unittests.cc (97%) rename shell/platform/common/{cpp => }/client_wrapper/standard_method_codec_unittests.cc (95%) rename shell/platform/common/{cpp => }/client_wrapper/testing/stub_flutter_api.cc (98%) rename shell/platform/common/{cpp => }/client_wrapper/testing/stub_flutter_api.h (94%) rename shell/platform/common/{cpp => }/client_wrapper/testing/test_codec_extensions.cc (96%) rename shell/platform/common/{cpp => }/client_wrapper/testing/test_codec_extensions.h (92%) rename shell/platform/common/{cpp => }/client_wrapper/texture_registrar_impl.h (100%) rename shell/platform/common/{cpp => }/client_wrapper/texture_registrar_unittests.cc (94%) rename shell/platform/common/{cpp => }/engine_switches.cc (96%) rename shell/platform/common/{cpp => }/engine_switches.h (100%) rename shell/platform/common/{cpp => }/engine_switches_unittests.cc (97%) rename shell/platform/common/{cpp => }/flutter_platform_node_delegate.cc (100%) rename shell/platform/common/{cpp => }/flutter_platform_node_delegate.h (100%) rename shell/platform/common/{cpp => }/flutter_platform_node_delegate_unittests.cc (100%) rename shell/platform/common/{cpp => }/geometry.h (100%) rename shell/platform/common/{cpp => }/geometry_unittests.cc (95%) rename shell/platform/common/{cpp => }/incoming_message_dispatcher.cc (96%) rename shell/platform/common/{cpp => }/incoming_message_dispatcher.h (97%) rename shell/platform/common/{cpp => }/json_message_codec.cc (96%) rename shell/platform/common/{cpp => }/json_message_codec.h (93%) rename shell/platform/common/{cpp => }/json_message_codec_unittests.cc (95%) rename shell/platform/common/{cpp => }/json_method_codec.cc (97%) rename shell/platform/common/{cpp => }/json_method_codec.h (91%) rename shell/platform/common/{cpp => }/json_method_codec_unittests.cc (97%) rename shell/platform/common/{cpp => }/path_utils.cc (94%) rename shell/platform/common/{cpp => }/path_utils.h (100%) rename shell/platform/common/{cpp => }/path_utils_unittests.cc (92%) rename shell/platform/common/{cpp => }/public/flutter_export.h (100%) rename shell/platform/common/{cpp => }/public/flutter_messenger.h (100%) rename shell/platform/common/{cpp => }/public/flutter_plugin_registrar.h (100%) rename shell/platform/common/{cpp => }/public/flutter_texture_registrar.h (100%) rename shell/platform/common/{cpp => }/test_accessibility_bridge.cc (100%) rename shell/platform/common/{cpp => }/test_accessibility_bridge.h (100%) rename shell/platform/common/{cpp => }/text_input_model.cc (99%) rename shell/platform/common/{cpp => }/text_input_model.h (99%) rename shell/platform/common/{cpp => }/text_input_model_unittests.cc (99%) rename shell/platform/common/{cpp => }/text_range.h (100%) rename shell/platform/common/{cpp => }/text_range_unittests.cc (99%) diff --git a/BUILD.gn b/BUILD.gn index c36670ad7d9fd..c174f50169e59 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -135,15 +135,15 @@ group("flutter") { # embeddings are being built. if (enable_desktop_embeddings) { public_deps += [ - "//flutter/shell/platform/common/cpp:common_cpp_core_unittests", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests", + "//flutter/shell/platform/common:common_cpp_core_unittests", + "//flutter/shell/platform/common/client_wrapper:client_wrapper_unittests", ] if (!is_fuchsia) { # These tests require the embedder and thus cannot run on fuchsia. # TODO(): Enable when embedder works on fuchsia. public_deps += - [ "//flutter/shell/platform/common/cpp:common_cpp_unittests" ] + [ "//flutter/shell/platform/common:common_cpp_unittests" ] # These tests require GLFW and thus cannot run on fuchsia. public_deps += [ "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests" ] diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index b8d6f1a14e6c4..9292b5aa78057 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -880,77 +880,77 @@ FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.h FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h -FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.cc -FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.h -FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/byte_buffer_streams.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/core_implementations.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/engine_method_result.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/byte_streams.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/engine_method_result.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_sink.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registry.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_call_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_codec.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_impl.h -FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.cc -FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.h -FILE: ../../../flutter/shell/platform/common/cpp/engine_switches_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.cc -FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.h -FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/geometry.h -FILE: ../../../flutter/shell/platform/common/cpp/geometry_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.cc -FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.h -FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.cc -FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.h -FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.cc -FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.h -FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/path_utils.cc -FILE: ../../../flutter/shell/platform/common/cpp/path_utils.h -FILE: ../../../flutter/shell/platform/common/cpp/path_utils_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_export.h -FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_messenger.h -FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_plugin_registrar.h -FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_texture_registrar.h -FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.cc -FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.h -FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.cc -FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.h -FILE: ../../../flutter/shell/platform/common/cpp/text_input_model_unittests.cc -FILE: ../../../flutter/shell/platform/common/cpp/text_range.h -FILE: ../../../flutter/shell/platform/common/cpp/text_range_unittests.cc +FILE: ../../../flutter/shell/platform/common/accessibility_bridge.cc +FILE: ../../../flutter/shell/platform/common/accessibility_bridge.h +FILE: ../../../flutter/shell/platform/common/accessibility_bridge_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/byte_buffer_streams.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/core_implementations.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/encodable_value_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/engine_method_result.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/event_channel_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/engine_method_result.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registry.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/method_call_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/method_channel_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/method_result_functions_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_codec.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc +FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_impl.h +FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_unittests.cc +FILE: ../../../flutter/shell/platform/common/engine_switches.cc +FILE: ../../../flutter/shell/platform/common/engine_switches.h +FILE: ../../../flutter/shell/platform/common/engine_switches_unittests.cc +FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.cc +FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h +FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate_unittests.cc +FILE: ../../../flutter/shell/platform/common/geometry.h +FILE: ../../../flutter/shell/platform/common/geometry_unittests.cc +FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc +FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h +FILE: ../../../flutter/shell/platform/common/json_message_codec.cc +FILE: ../../../flutter/shell/platform/common/json_message_codec.h +FILE: ../../../flutter/shell/platform/common/json_message_codec_unittests.cc +FILE: ../../../flutter/shell/platform/common/json_method_codec.cc +FILE: ../../../flutter/shell/platform/common/json_method_codec.h +FILE: ../../../flutter/shell/platform/common/json_method_codec_unittests.cc +FILE: ../../../flutter/shell/platform/common/path_utils.cc +FILE: ../../../flutter/shell/platform/common/path_utils.h +FILE: ../../../flutter/shell/platform/common/path_utils_unittests.cc +FILE: ../../../flutter/shell/platform/common/public/flutter_export.h +FILE: ../../../flutter/shell/platform/common/public/flutter_messenger.h +FILE: ../../../flutter/shell/platform/common/public/flutter_plugin_registrar.h +FILE: ../../../flutter/shell/platform/common/public/flutter_texture_registrar.h +FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.cc +FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.h +FILE: ../../../flutter/shell/platform/common/text_input_model.cc +FILE: ../../../flutter/shell/platform/common/text_input_model.h +FILE: ../../../flutter/shell/platform/common/text_input_model_unittests.cc +FILE: ../../../flutter/shell/platform/common/text_range.h +FILE: ../../../flutter/shell/platform/common/text_range_unittests.cc FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm FILE: ../../../flutter/shell/platform/darwin/common/command_line.h diff --git a/shell/platform/common/cpp/BUILD.gn b/shell/platform/common/BUILD.gn similarity index 95% rename from shell/platform/common/cpp/BUILD.gn rename to shell/platform/common/BUILD.gn index 8edd61ec1a8d9..abc4870e98607 100644 --- a/shell/platform/common/cpp/BUILD.gn +++ b/shell/platform/common/BUILD.gn @@ -109,7 +109,7 @@ source_set("common_cpp") { deps = [ ":common_cpp_library_headers", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", "//flutter/shell/platform/embedder:embedder_as_internal_library", ] @@ -175,8 +175,8 @@ if (enable_unittests) { ":common_cpp_fixtures", ":common_cpp_input", ":common_cpp_switches", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", + "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs", "//flutter/testing", ] diff --git a/shell/platform/common/cpp/accessibility_bridge.cc b/shell/platform/common/accessibility_bridge.cc similarity index 100% rename from shell/platform/common/cpp/accessibility_bridge.cc rename to shell/platform/common/accessibility_bridge.cc diff --git a/shell/platform/common/cpp/accessibility_bridge.h b/shell/platform/common/accessibility_bridge.h similarity index 100% rename from shell/platform/common/cpp/accessibility_bridge.h rename to shell/platform/common/accessibility_bridge.h diff --git a/shell/platform/common/cpp/accessibility_bridge_unittests.cc b/shell/platform/common/accessibility_bridge_unittests.cc similarity index 100% rename from shell/platform/common/cpp/accessibility_bridge_unittests.cc rename to shell/platform/common/accessibility_bridge_unittests.cc diff --git a/shell/platform/common/cpp/client_wrapper/BUILD.gn b/shell/platform/common/client_wrapper/BUILD.gn similarity index 84% rename from shell/platform/common/cpp/client_wrapper/BUILD.gn rename to shell/platform/common/client_wrapper/BUILD.gn index 96a1c34177066..d301dd5251d76 100644 --- a/shell/platform/common/cpp/client_wrapper/BUILD.gn +++ b/shell/platform/common/client_wrapper/BUILD.gn @@ -11,13 +11,13 @@ source_set("client_wrapper") { public = core_cpp_client_wrapper_includes + core_cpp_client_wrapper_internal_headers - deps = [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] + deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ] configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] public_configs = - [ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ] + [ "//flutter/shell/platform/common:relative_flutter_library_headers" ] } source_set("client_wrapper_library_stubs") { @@ -29,7 +29,7 @@ source_set("client_wrapper_library_stubs") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] public_deps = - [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] + [ "//flutter/shell/platform/common:common_cpp_library_headers" ] } test_fixtures("client_wrapper_fixtures") { diff --git a/shell/platform/common/cpp/client_wrapper/README b/shell/platform/common/client_wrapper/README similarity index 100% rename from shell/platform/common/cpp/client_wrapper/README rename to shell/platform/common/client_wrapper/README diff --git a/shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc b/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc similarity index 90% rename from shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc rename to shell/platform/common/client_wrapper/basic_message_channel_unittests.cc index 4d5eb891f53b2..36d67d56b832e 100644 --- a/shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc +++ b/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h" #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h b/shell/platform/common/client_wrapper/binary_messenger_impl.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h rename to shell/platform/common/client_wrapper/binary_messenger_impl.h diff --git a/shell/platform/common/cpp/client_wrapper/byte_buffer_streams.h b/shell/platform/common/client_wrapper/byte_buffer_streams.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/byte_buffer_streams.h rename to shell/platform/common/client_wrapper/byte_buffer_streams.h diff --git a/shell/platform/common/cpp/client_wrapper/core_implementations.cc b/shell/platform/common/client_wrapper/core_implementations.cc similarity index 100% rename from shell/platform/common/cpp/client_wrapper/core_implementations.cc rename to shell/platform/common/client_wrapper/core_implementations.cc diff --git a/shell/platform/common/cpp/client_wrapper/core_wrapper_files.gni b/shell/platform/common/client_wrapper/core_wrapper_files.gni similarity index 100% rename from shell/platform/common/cpp/client_wrapper/core_wrapper_files.gni rename to shell/platform/common/client_wrapper/core_wrapper_files.gni diff --git a/shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc b/shell/platform/common/client_wrapper/encodable_value_unittests.cc similarity index 98% rename from shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc rename to shell/platform/common/client_wrapper/encodable_value_unittests.cc index 1f31c47b67c84..9a02cde0813db 100644 --- a/shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc +++ b/shell/platform/common/client_wrapper/encodable_value_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h" #include diff --git a/shell/platform/common/cpp/client_wrapper/engine_method_result.cc b/shell/platform/common/client_wrapper/engine_method_result.cc similarity index 100% rename from shell/platform/common/cpp/client_wrapper/engine_method_result.cc rename to shell/platform/common/client_wrapper/engine_method_result.cc diff --git a/shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc b/shell/platform/common/client_wrapper/event_channel_unittests.cc similarity index 94% rename from shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc rename to shell/platform/common/client_wrapper/event_channel_unittests.cc index 709baaf5ab459..7e9face38a4a5 100644 --- a/shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc +++ b/shell/platform/common/client_wrapper/event_channel_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h" #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h b/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h rename to shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h b/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h rename to shell/platform/common/client_wrapper/include/flutter/binary_messenger.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/byte_streams.h b/shell/platform/common/client_wrapper/include/flutter/byte_streams.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/byte_streams.h rename to shell/platform/common/client_wrapper/include/flutter/byte_streams.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h b/shell/platform/common/client_wrapper/include/flutter/encodable_value.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h rename to shell/platform/common/client_wrapper/include/flutter/encodable_value.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/engine_method_result.h b/shell/platform/common/client_wrapper/include/flutter/engine_method_result.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/engine_method_result.h rename to shell/platform/common/client_wrapper/include/flutter/engine_method_result.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h b/shell/platform/common/client_wrapper/include/flutter/event_channel.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h rename to shell/platform/common/client_wrapper/include/flutter/event_channel.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/event_sink.h b/shell/platform/common/client_wrapper/include/flutter/event_sink.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/event_sink.h rename to shell/platform/common/client_wrapper/include/flutter/event_sink.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler.h b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler.h rename to shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h rename to shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h b/shell/platform/common/client_wrapper/include/flutter/message_codec.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h rename to shell/platform/common/client_wrapper/include/flutter/message_codec.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h b/shell/platform/common/client_wrapper/include/flutter/method_call.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h rename to shell/platform/common/client_wrapper/include/flutter/method_call.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h b/shell/platform/common/client_wrapper/include/flutter/method_channel.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h rename to shell/platform/common/client_wrapper/include/flutter/method_channel.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h b/shell/platform/common/client_wrapper/include/flutter/method_codec.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h rename to shell/platform/common/client_wrapper/include/flutter/method_codec.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/method_result.h b/shell/platform/common/client_wrapper/include/flutter/method_result.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/method_result.h rename to shell/platform/common/client_wrapper/include/flutter/method_result.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h b/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h rename to shell/platform/common/client_wrapper/include/flutter/method_result_functions.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h b/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h rename to shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registry.h b/shell/platform/common/client_wrapper/include/flutter/plugin_registry.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registry.h rename to shell/platform/common/client_wrapper/include/flutter/plugin_registry.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h b/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h rename to shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h b/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h rename to shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h b/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h rename to shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h diff --git a/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h b/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h rename to shell/platform/common/client_wrapper/include/flutter/texture_registrar.h diff --git a/shell/platform/common/cpp/client_wrapper/method_call_unittests.cc b/shell/platform/common/client_wrapper/method_call_unittests.cc similarity index 86% rename from shell/platform/common/cpp/client_wrapper/method_call_unittests.cc rename to shell/platform/common/client_wrapper/method_call_unittests.cc index a3d093d8c8bae..19e9eb36aeb81 100644 --- a/shell/platform/common/cpp/client_wrapper/method_call_unittests.cc +++ b/shell/platform/common/client_wrapper/method_call_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h" #include #include diff --git a/shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc b/shell/platform/common/client_wrapper/method_channel_unittests.cc similarity index 93% rename from shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc rename to shell/platform/common/client_wrapper/method_channel_unittests.cc index bd1f027271cf7..2044c1419c925 100644 --- a/shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc +++ b/shell/platform/common/client_wrapper/method_channel_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc b/shell/platform/common/client_wrapper/method_result_functions_unittests.cc similarity index 94% rename from shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc rename to shell/platform/common/client_wrapper/method_result_functions_unittests.cc index 2d1730835e50c..199a90265b899 100644 --- a/shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc +++ b/shell/platform/common/client_wrapper/method_result_functions_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h" #include #include diff --git a/shell/platform/common/cpp/client_wrapper/plugin_registrar.cc b/shell/platform/common/client_wrapper/plugin_registrar.cc similarity index 100% rename from shell/platform/common/cpp/client_wrapper/plugin_registrar.cc rename to shell/platform/common/client_wrapper/plugin_registrar.cc diff --git a/shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc b/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc similarity index 97% rename from shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc rename to shell/platform/common/client_wrapper/plugin_registrar_unittests.cc index c30e07a26183f..c18459a07490f 100644 --- a/shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc +++ b/shell/platform/common/client_wrapper/plugin_registrar_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h" +#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/publish.gni b/shell/platform/common/client_wrapper/publish.gni similarity index 100% rename from shell/platform/common/cpp/client_wrapper/publish.gni rename to shell/platform/common/client_wrapper/publish.gni diff --git a/shell/platform/common/cpp/client_wrapper/standard_codec.cc b/shell/platform/common/client_wrapper/standard_codec.cc similarity index 100% rename from shell/platform/common/cpp/client_wrapper/standard_codec.cc rename to shell/platform/common/client_wrapper/standard_codec.cc diff --git a/shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc b/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc similarity index 97% rename from shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc rename to shell/platform/common/client_wrapper/standard_message_codec_unittests.cc index 1ddb9e7e28644..f1fa75e7c8ef1 100644 --- a/shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc +++ b/shell/platform/common/client_wrapper/standard_message_codec_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h" #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h" +#include "flutter/shell/platform/common/client_wrapper/testing/test_codec_extensions.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc b/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc similarity index 95% rename from shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc rename to shell/platform/common/client_wrapper/standard_method_codec_unittests.cc index ded19e195f8cb..7796b5e9fe196 100644 --- a/shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc +++ b/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h" +#include "flutter/shell/platform/common/client_wrapper/testing/test_codec_extensions.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.cc b/shell/platform/common/client_wrapper/testing/stub_flutter_api.cc similarity index 98% rename from shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.cc rename to shell/platform/common/client_wrapper/testing/stub_flutter_api.cc index 265f85407edfc..0612e8249b3b2 100644 --- a/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.cc +++ b/shell/platform/common/client_wrapper/testing/stub_flutter_api.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 "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h" +#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h" static flutter::testing::StubFlutterApi* s_stub_implementation; diff --git a/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h b/shell/platform/common/client_wrapper/testing/stub_flutter_api.h similarity index 94% rename from shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h rename to shell/platform/common/client_wrapper/testing/stub_flutter_api.h index 9549aa2aa0867..b793caf28668e 100644 --- a/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h +++ b/shell/platform/common/client_wrapper/testing/stub_flutter_api.h @@ -7,14 +7,14 @@ #include -#include "flutter/shell/platform/common/cpp/public/flutter_messenger.h" -#include "flutter/shell/platform/common/cpp/public/flutter_plugin_registrar.h" +#include "flutter/shell/platform/common/public/flutter_messenger.h" +#include "flutter/shell/platform/common/public/flutter_plugin_registrar.h" namespace flutter { namespace testing { // Base class for a object that provides test implementations of the APIs in -// the headers in platform/common/cpp/public/. +// the headers in platform/common/public/. // Linking this class into a test binary will provide dummy forwarding // implementantions of that C API, so that the wrapper can be tested separately diff --git a/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.cc b/shell/platform/common/client_wrapper/testing/test_codec_extensions.cc similarity index 96% rename from shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.cc rename to shell/platform/common/client_wrapper/testing/test_codec_extensions.cc index 53bdfe93a54e8..caccb3adb2deb 100644 --- a/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.cc +++ b/shell/platform/common/client_wrapper/testing/test_codec_extensions.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 "flutter/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h" +#include "flutter/shell/platform/common/client_wrapper/testing/test_codec_extensions.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h b/shell/platform/common/client_wrapper/testing/test_codec_extensions.h similarity index 92% rename from shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h rename to shell/platform/common/client_wrapper/testing/test_codec_extensions.h index cbe01c8a886ff..fda076ae423aa 100644 --- a/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h +++ b/shell/platform/common/client_wrapper/testing/test_codec_extensions.h @@ -5,8 +5,8 @@ #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CPP_CLIENT_WRAPPER_TESTING_TEST_CODEC_EXTENSIONS_H_ #define FLUTTER_SHELL_PLATFORM_COMMON_CPP_CLIENT_WRAPPER_TESTING_TEST_CODEC_EXTENSIONS_H_ -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h" namespace flutter { diff --git a/shell/platform/common/cpp/client_wrapper/texture_registrar_impl.h b/shell/platform/common/client_wrapper/texture_registrar_impl.h similarity index 100% rename from shell/platform/common/cpp/client_wrapper/texture_registrar_impl.h rename to shell/platform/common/client_wrapper/texture_registrar_impl.h diff --git a/shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc b/shell/platform/common/client_wrapper/texture_registrar_unittests.cc similarity index 94% rename from shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc rename to shell/platform/common/client_wrapper/texture_registrar_unittests.cc index 6a0718462e5c9..02ccc6fa76891 100644 --- a/shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc +++ b/shell/platform/common/client_wrapper/texture_registrar_unittests.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 "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h" #include #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/engine_switches.cc b/shell/platform/common/engine_switches.cc similarity index 96% rename from shell/platform/common/cpp/engine_switches.cc rename to shell/platform/common/engine_switches.cc index 52bafc8738fa0..2295a5508f415 100644 --- a/shell/platform/common/cpp/engine_switches.cc +++ b/shell/platform/common/engine_switches.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 "flutter/shell/platform/common/cpp/engine_switches.h" +#include "flutter/shell/platform/common/engine_switches.h" #include #include diff --git a/shell/platform/common/cpp/engine_switches.h b/shell/platform/common/engine_switches.h similarity index 100% rename from shell/platform/common/cpp/engine_switches.h rename to shell/platform/common/engine_switches.h diff --git a/shell/platform/common/cpp/engine_switches_unittests.cc b/shell/platform/common/engine_switches_unittests.cc similarity index 97% rename from shell/platform/common/cpp/engine_switches_unittests.cc rename to shell/platform/common/engine_switches_unittests.cc index 2823fa876fe0f..ac7b01ded5003 100644 --- a/shell/platform/common/cpp/engine_switches_unittests.cc +++ b/shell/platform/common/engine_switches_unittests.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 "flutter/shell/platform/common/cpp/engine_switches.h" +#include "flutter/shell/platform/common/engine_switches.h" #include "gtest/gtest.h" diff --git a/shell/platform/common/cpp/flutter_platform_node_delegate.cc b/shell/platform/common/flutter_platform_node_delegate.cc similarity index 100% rename from shell/platform/common/cpp/flutter_platform_node_delegate.cc rename to shell/platform/common/flutter_platform_node_delegate.cc diff --git a/shell/platform/common/cpp/flutter_platform_node_delegate.h b/shell/platform/common/flutter_platform_node_delegate.h similarity index 100% rename from shell/platform/common/cpp/flutter_platform_node_delegate.h rename to shell/platform/common/flutter_platform_node_delegate.h diff --git a/shell/platform/common/cpp/flutter_platform_node_delegate_unittests.cc b/shell/platform/common/flutter_platform_node_delegate_unittests.cc similarity index 100% rename from shell/platform/common/cpp/flutter_platform_node_delegate_unittests.cc rename to shell/platform/common/flutter_platform_node_delegate_unittests.cc diff --git a/shell/platform/common/cpp/geometry.h b/shell/platform/common/geometry.h similarity index 100% rename from shell/platform/common/cpp/geometry.h rename to shell/platform/common/geometry.h diff --git a/shell/platform/common/cpp/geometry_unittests.cc b/shell/platform/common/geometry_unittests.cc similarity index 95% rename from shell/platform/common/cpp/geometry_unittests.cc rename to shell/platform/common/geometry_unittests.cc index 78479a2258ce2..c8645028be909 100644 --- a/shell/platform/common/cpp/geometry_unittests.cc +++ b/shell/platform/common/geometry_unittests.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 "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/geometry.h" #include "gtest/gtest.h" diff --git a/shell/platform/common/cpp/incoming_message_dispatcher.cc b/shell/platform/common/incoming_message_dispatcher.cc similarity index 96% rename from shell/platform/common/cpp/incoming_message_dispatcher.cc rename to shell/platform/common/incoming_message_dispatcher.cc index 6e10d2faaa046..07dd0b1900d62 100644 --- a/shell/platform/common/cpp/incoming_message_dispatcher.cc +++ b/shell/platform/common/incoming_message_dispatcher.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 "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h" +#include "flutter/shell/platform/common/incoming_message_dispatcher.h" namespace flutter { diff --git a/shell/platform/common/cpp/incoming_message_dispatcher.h b/shell/platform/common/incoming_message_dispatcher.h similarity index 97% rename from shell/platform/common/cpp/incoming_message_dispatcher.h rename to shell/platform/common/incoming_message_dispatcher.h index 192552be19403..6900654254958 100644 --- a/shell/platform/common/cpp/incoming_message_dispatcher.h +++ b/shell/platform/common/incoming_message_dispatcher.h @@ -11,7 +11,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/public/flutter_messenger.h" +#include "flutter/shell/platform/common/public/flutter_messenger.h" namespace flutter { diff --git a/shell/platform/common/cpp/json_message_codec.cc b/shell/platform/common/json_message_codec.cc similarity index 96% rename from shell/platform/common/cpp/json_message_codec.cc rename to shell/platform/common/json_message_codec.cc index d2a43bd806ded..b91e57e412c64 100644 --- a/shell/platform/common/cpp/json_message_codec.cc +++ b/shell/platform/common/json_message_codec.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 "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" #include #include diff --git a/shell/platform/common/cpp/json_message_codec.h b/shell/platform/common/json_message_codec.h similarity index 93% rename from shell/platform/common/cpp/json_message_codec.h rename to shell/platform/common/json_message_codec.h index 81f2502c0c71d..f22a34ebb9951 100644 --- a/shell/platform/common/cpp/json_message_codec.h +++ b/shell/platform/common/json_message_codec.h @@ -7,7 +7,7 @@ #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h" namespace flutter { diff --git a/shell/platform/common/cpp/json_message_codec_unittests.cc b/shell/platform/common/json_message_codec_unittests.cc similarity index 95% rename from shell/platform/common/cpp/json_message_codec_unittests.cc rename to shell/platform/common/json_message_codec_unittests.cc index 3354f30a728df..b31f33fca0f61 100644 --- a/shell/platform/common/cpp/json_message_codec_unittests.cc +++ b/shell/platform/common/json_message_codec_unittests.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 "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" #include #include diff --git a/shell/platform/common/cpp/json_method_codec.cc b/shell/platform/common/json_method_codec.cc similarity index 97% rename from shell/platform/common/cpp/json_method_codec.cc rename to shell/platform/common/json_method_codec.cc index f7e4428844eba..6d69cca94ceb1 100644 --- a/shell/platform/common/cpp/json_method_codec.cc +++ b/shell/platform/common/json_method_codec.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/json_method_codec.h" -#include "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" namespace flutter { diff --git a/shell/platform/common/cpp/json_method_codec.h b/shell/platform/common/json_method_codec.h similarity index 91% rename from shell/platform/common/cpp/json_method_codec.h rename to shell/platform/common/json_method_codec.h index 25e3963fcb03d..cf249ed8b6c2f 100644 --- a/shell/platform/common/cpp/json_method_codec.h +++ b/shell/platform/common/json_method_codec.h @@ -7,8 +7,8 @@ #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h" namespace flutter { diff --git a/shell/platform/common/cpp/json_method_codec_unittests.cc b/shell/platform/common/json_method_codec_unittests.cc similarity index 97% rename from shell/platform/common/cpp/json_method_codec_unittests.cc rename to shell/platform/common/json_method_codec_unittests.cc index f9d2ec882fc45..425233af00903 100644 --- a/shell/platform/common/cpp/json_method_codec_unittests.cc +++ b/shell/platform/common/json_method_codec_unittests.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/json_method_codec.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h" #include "gtest/gtest.h" namespace flutter { diff --git a/shell/platform/common/cpp/path_utils.cc b/shell/platform/common/path_utils.cc similarity index 94% rename from shell/platform/common/cpp/path_utils.cc rename to shell/platform/common/path_utils.cc index 6da31077a761e..4e5690eb54fe4 100644 --- a/shell/platform/common/cpp/path_utils.cc +++ b/shell/platform/common/path_utils.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 "flutter/shell/platform/common/cpp/path_utils.h" +#include "flutter/shell/platform/common/path_utils.h" #if defined(_WIN32) #include diff --git a/shell/platform/common/cpp/path_utils.h b/shell/platform/common/path_utils.h similarity index 100% rename from shell/platform/common/cpp/path_utils.h rename to shell/platform/common/path_utils.h diff --git a/shell/platform/common/cpp/path_utils_unittests.cc b/shell/platform/common/path_utils_unittests.cc similarity index 92% rename from shell/platform/common/cpp/path_utils_unittests.cc rename to shell/platform/common/path_utils_unittests.cc index 2044d34662bc4..4612f4060fd6f 100644 --- a/shell/platform/common/cpp/path_utils_unittests.cc +++ b/shell/platform/common/path_utils_unittests.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 "flutter/shell/platform/common/cpp/path_utils.h" +#include "flutter/shell/platform/common/path_utils.h" #include "gtest/gtest.h" diff --git a/shell/platform/common/cpp/public/flutter_export.h b/shell/platform/common/public/flutter_export.h similarity index 100% rename from shell/platform/common/cpp/public/flutter_export.h rename to shell/platform/common/public/flutter_export.h diff --git a/shell/platform/common/cpp/public/flutter_messenger.h b/shell/platform/common/public/flutter_messenger.h similarity index 100% rename from shell/platform/common/cpp/public/flutter_messenger.h rename to shell/platform/common/public/flutter_messenger.h diff --git a/shell/platform/common/cpp/public/flutter_plugin_registrar.h b/shell/platform/common/public/flutter_plugin_registrar.h similarity index 100% rename from shell/platform/common/cpp/public/flutter_plugin_registrar.h rename to shell/platform/common/public/flutter_plugin_registrar.h diff --git a/shell/platform/common/cpp/public/flutter_texture_registrar.h b/shell/platform/common/public/flutter_texture_registrar.h similarity index 100% rename from shell/platform/common/cpp/public/flutter_texture_registrar.h rename to shell/platform/common/public/flutter_texture_registrar.h diff --git a/shell/platform/common/cpp/test_accessibility_bridge.cc b/shell/platform/common/test_accessibility_bridge.cc similarity index 100% rename from shell/platform/common/cpp/test_accessibility_bridge.cc rename to shell/platform/common/test_accessibility_bridge.cc diff --git a/shell/platform/common/cpp/test_accessibility_bridge.h b/shell/platform/common/test_accessibility_bridge.h similarity index 100% rename from shell/platform/common/cpp/test_accessibility_bridge.h rename to shell/platform/common/test_accessibility_bridge.h diff --git a/shell/platform/common/cpp/text_input_model.cc b/shell/platform/common/text_input_model.cc similarity index 99% rename from shell/platform/common/cpp/text_input_model.cc rename to shell/platform/common/text_input_model.cc index 70d8001c1651d..4e04775ff284d 100644 --- a/shell/platform/common/cpp/text_input_model.cc +++ b/shell/platform/common/text_input_model.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 "flutter/shell/platform/common/cpp/text_input_model.h" +#include "flutter/shell/platform/common/text_input_model.h" #include #include diff --git a/shell/platform/common/cpp/text_input_model.h b/shell/platform/common/text_input_model.h similarity index 99% rename from shell/platform/common/cpp/text_input_model.h rename to shell/platform/common/text_input_model.h index 340a2b62b8738..e0e88813dbf99 100644 --- a/shell/platform/common/cpp/text_input_model.h +++ b/shell/platform/common/text_input_model.h @@ -8,7 +8,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/text_range.h" +#include "flutter/shell/platform/common/text_range.h" namespace flutter { diff --git a/shell/platform/common/cpp/text_input_model_unittests.cc b/shell/platform/common/text_input_model_unittests.cc similarity index 99% rename from shell/platform/common/cpp/text_input_model_unittests.cc rename to shell/platform/common/text_input_model_unittests.cc index 6ee80206295eb..d5879af2c8c7e 100644 --- a/shell/platform/common/cpp/text_input_model_unittests.cc +++ b/shell/platform/common/text_input_model_unittests.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 "flutter/shell/platform/common/cpp/text_input_model.h" +#include "flutter/shell/platform/common/text_input_model.h" #include #include diff --git a/shell/platform/common/cpp/text_range.h b/shell/platform/common/text_range.h similarity index 100% rename from shell/platform/common/cpp/text_range.h rename to shell/platform/common/text_range.h diff --git a/shell/platform/common/cpp/text_range_unittests.cc b/shell/platform/common/text_range_unittests.cc similarity index 99% rename from shell/platform/common/cpp/text_range_unittests.cc rename to shell/platform/common/text_range_unittests.cc index 9aecf34309b98..6fe20ddfda0d9 100644 --- a/shell/platform/common/cpp/text_range_unittests.cc +++ b/shell/platform/common/text_range_unittests.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 "flutter/shell/platform/common/cpp/text_range.h" +#include "flutter/shell/platform/common/text_range.h" #include "gtest/gtest.h" diff --git a/shell/platform/darwin/macos/BUILD.gn b/shell/platform/darwin/macos/BUILD.gn index 26e55cf621860..b68a1431a8e73 100644 --- a/shell/platform/darwin/macos/BUILD.gn +++ b/shell/platform/darwin/macos/BUILD.gn @@ -102,7 +102,7 @@ source_set("flutter_framework_source") { ":macos_gpu_configuration", "//flutter/flow:flow", "//flutter/fml", - "//flutter/shell/platform/common/cpp:common_cpp_switches", + "//flutter/shell/platform/common:common_cpp_switches", "//flutter/shell/platform/darwin/common:framework_shared", "//flutter/shell/platform/embedder:embedder_as_internal_library", "//third_party/skia", diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm index 4081c44dbe8c7..a18690772cf2b 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm @@ -7,7 +7,7 @@ #include -#include "flutter/shell/platform/common/cpp/engine_switches.h" +#include "flutter/shell/platform/common/engine_switches.h" static NSString* const kICUBundlePath = @"icudtl.dat"; static NSString* const kAppBundleIdentifier = @"io.flutter.flutter.app"; diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index f5fcd59470994..6152166211b8a 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -111,7 +111,7 @@ template("runner_sources") { "//flutter/lib/ui", "//flutter/runtime", "//flutter/shell/common", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", ] flutter_deps = [ ":fuchsia_gpu_configuration", diff --git a/shell/platform/fuchsia/flutter/platform_view.cc b/shell/platform/fuchsia/flutter/platform_view.cc index 19f1080165542..2e74f2eac096d 100644 --- a/shell/platform/fuchsia/flutter/platform_view.cc +++ b/shell/platform/fuchsia/flutter/platform_view.cc @@ -15,8 +15,8 @@ #include "flutter/fml/logging.h" #include "flutter/lib/ui/window/pointer_data.h" #include "flutter/lib/ui/window/window.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h" #include "third_party/rapidjson/include/rapidjson/document.h" #include "third_party/rapidjson/include/rapidjson/stringbuffer.h" #include "third_party/rapidjson/include/rapidjson/writer.h" diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn index 21ea61c7316a7..4e48d9a0e4dee 100644 --- a/shell/platform/glfw/BUILD.gn +++ b/shell/platform/glfw/BUILD.gn @@ -20,13 +20,13 @@ source_set("flutter_glfw_headers") { public = _public_headers public_deps = - [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] + [ "//flutter/shell/platform/common:common_cpp_library_headers" ] configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] public_configs = - [ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ] + [ "//flutter/shell/platform/common:relative_flutter_library_headers" ] } source_set("flutter_glfw") { @@ -51,14 +51,14 @@ source_set("flutter_glfw") { ] configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] deps = [ ":flutter_glfw_headers", "//build/secondary/third_party/glfw", - "//flutter/shell/platform/common/cpp:common_cpp", - "//flutter/shell/platform/common/cpp:common_cpp_input", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", + "//flutter/shell/platform/common:common_cpp", + "//flutter/shell/platform/common:common_cpp_input", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", "//flutter/shell/platform/embedder:embedder_as_internal_library", "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw", "//third_party/rapidjson", @@ -96,5 +96,5 @@ copy("publish_headers_glfw") { outputs = [ "$root_out_dir/{{source_file_part}}" ] # The GLFW header assumes the presence of the common headers. - deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ] + deps = [ "//flutter/shell/platform/common:publish_headers" ] } diff --git a/shell/platform/glfw/client_wrapper/BUILD.gn b/shell/platform/glfw/client_wrapper/BUILD.gn index c0d6ca643896f..6f1faae1f534c 100644 --- a/shell/platform/glfw/client_wrapper/BUILD.gn +++ b/shell/platform/glfw/client_wrapper/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/shell/platform/common/cpp/client_wrapper/publish.gni") +import("//flutter/shell/platform/common/client_wrapper/publish.gni") import("//flutter/testing/testing.gni") _wrapper_includes = [ @@ -22,7 +22,7 @@ _wrapper_sources = [ # header directory of the core wrapper files so these includes will work. config("relative_core_wrapper_headers") { include_dirs = - [ "//flutter/shell/platform/common/cpp/client_wrapper/include/flutter" ] + [ "//flutter/shell/platform/common/client_wrapper/include/flutter" ] } # GLFW client wrapper build for internal use by the shell implementation. @@ -31,17 +31,17 @@ source_set("client_wrapper_glfw") { public = _wrapper_includes deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_library_headers", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", + "//flutter/shell/platform/common:common_cpp_library_headers", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", "//flutter/shell/platform/glfw:flutter_glfw_headers", ] configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] public_configs = [ ":relative_core_wrapper_headers", - "//flutter/shell/platform/common/cpp:relative_flutter_library_headers", + "//flutter/shell/platform/common:relative_flutter_library_headers", "//flutter/shell/platform/glfw:relative_flutter_glfw_headers", ] } @@ -85,7 +85,7 @@ executable("client_wrapper_glfw_unittests") { ":client_wrapper_glfw", ":client_wrapper_glfw_fixtures", ":client_wrapper_library_stubs_glfw", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs", + "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs", "//flutter/testing", # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing diff --git a/shell/platform/glfw/flutter_glfw.cc b/shell/platform/glfw/flutter_glfw.cc index c926e86ca549c..4b8f42135898e 100644 --- a/shell/platform/glfw/flutter_glfw.cc +++ b/shell/platform/glfw/flutter_glfw.cc @@ -13,9 +13,9 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" -#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h" -#include "flutter/shell/platform/common/cpp/path_utils.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/incoming_message_dispatcher.h" +#include "flutter/shell/platform/common/path_utils.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/glfw/glfw_event_loop.h" #include "flutter/shell/platform/glfw/headless_event_loop.h" diff --git a/shell/platform/glfw/key_event_handler.cc b/shell/platform/glfw/key_event_handler.cc index bdd121091f54e..94244bd9b1682 100644 --- a/shell/platform/glfw/key_event_handler.cc +++ b/shell/platform/glfw/key_event_handler.cc @@ -6,7 +6,7 @@ #include -#include "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" static constexpr char kChannelName[] = "flutter/keyevent"; diff --git a/shell/platform/glfw/key_event_handler.h b/shell/platform/glfw/key_event_handler.h index 19b0ffa316591..0b40e0de92764 100644 --- a/shell/platform/glfw/key_event_handler.h +++ b/shell/platform/glfw/key_event_handler.h @@ -7,8 +7,8 @@ #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" #include "flutter/shell/platform/glfw/keyboard_hook_handler.h" #include "flutter/shell/platform/glfw/public/flutter_glfw.h" #include "rapidjson/document.h" diff --git a/shell/platform/glfw/platform_handler.cc b/shell/platform/glfw/platform_handler.cc index e2a6792126c9c..27098f985020f 100644 --- a/shell/platform/glfw/platform_handler.cc +++ b/shell/platform/glfw/platform_handler.cc @@ -6,7 +6,7 @@ #include -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/json_method_codec.h" static constexpr char kChannelName[] = "flutter/platform"; diff --git a/shell/platform/glfw/platform_handler.h b/shell/platform/glfw/platform_handler.h index 28cfc1f20f453..319b68f197b81 100644 --- a/shell/platform/glfw/platform_handler.h +++ b/shell/platform/glfw/platform_handler.h @@ -7,8 +7,8 @@ #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" #include "flutter/shell/platform/glfw/public/flutter_glfw.h" #include "rapidjson/document.h" diff --git a/shell/platform/glfw/text_input_plugin.cc b/shell/platform/glfw/text_input_plugin.cc index 7ebc29ecef6be..b0ea79d92170d 100644 --- a/shell/platform/glfw/text_input_plugin.cc +++ b/shell/platform/glfw/text_input_plugin.cc @@ -7,7 +7,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/json_method_codec.h" static constexpr char kSetEditingStateMethod[] = "TextInput.setEditingState"; static constexpr char kClearClientMethod[] = "TextInput.clearClient"; diff --git a/shell/platform/glfw/text_input_plugin.h b/shell/platform/glfw/text_input_plugin.h index 44072c0b2cae4..b70399e08fef8 100644 --- a/shell/platform/glfw/text_input_plugin.h +++ b/shell/platform/glfw/text_input_plugin.h @@ -8,9 +8,9 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" -#include "flutter/shell/platform/common/cpp/text_input_model.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/text_input_model.h" #include "flutter/shell/platform/glfw/keyboard_hook_handler.h" #include "flutter/shell/platform/glfw/public/flutter_glfw.h" diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn index 3706fcd1837c4..038909683bc18 100644 --- a/shell/platform/linux/BUILD.gn +++ b/shell/platform/linux/BUILD.gn @@ -127,8 +127,8 @@ source_set("flutter_linux_sources") { ] deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_input", - "//flutter/shell/platform/common/cpp:common_cpp_switches", + "//flutter/shell/platform/common:common_cpp_input", + "//flutter/shell/platform/common:common_cpp_switches", "//flutter/shell/platform/embedder:embedder_headers", "//third_party/rapidjson", ] diff --git a/shell/platform/linux/fl_dart_project.cc b/shell/platform/linux/fl_dart_project.cc index 25551c72403f9..3a8de3fa571f9 100644 --- a/shell/platform/linux/fl_dart_project.cc +++ b/shell/platform/linux/fl_dart_project.cc @@ -9,7 +9,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/engine_switches.h" +#include "flutter/shell/platform/common/engine_switches.h" #include "flutter/shell/platform/linux/fl_dart_project_private.h" struct _FlDartProject { diff --git a/shell/platform/linux/fl_text_input_plugin.cc b/shell/platform/linux/fl_text_input_plugin.cc index eb7841f723788..9a568a6cfbaac 100644 --- a/shell/platform/linux/fl_text_input_plugin.cc +++ b/shell/platform/linux/fl_text_input_plugin.cc @@ -6,7 +6,7 @@ #include -#include "flutter/shell/platform/common/cpp/text_input_model.h" +#include "flutter/shell/platform/common/text_input_model.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h" diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn index 0411b8dafa7c0..974d4b8cda193 100644 --- a/shell/platform/windows/BUILD.gn +++ b/shell/platform/windows/BUILD.gn @@ -27,18 +27,18 @@ source_set("flutter_windows_headers") { public = _public_headers public_deps = - [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] + [ "//flutter/shell/platform/common:common_cpp_library_headers" ] if (target_os == "winuwp") { configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] } else { configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] } public_configs = - [ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ] + [ "//flutter/shell/platform/common:relative_flutter_library_headers" ] } source_set("flutter_windows_source") { @@ -114,7 +114,7 @@ source_set("flutter_windows_source") { } configs += [ - "//flutter/shell/platform/common/cpp:desktop_library_implementation", + "//flutter/shell/platform/common:desktop_library_implementation", "//third_party/angle:gl_prototypes", ] @@ -127,10 +127,10 @@ source_set("flutter_windows_source") { deps = [ ":flutter_windows_headers", - "//flutter/shell/platform/common/cpp:common_cpp", - "//flutter/shell/platform/common/cpp:common_cpp_input", - "//flutter/shell/platform/common/cpp:common_cpp_switches", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", + "//flutter/shell/platform/common:common_cpp", + "//flutter/shell/platform/common:common_cpp_input", + "//flutter/shell/platform/common:common_cpp_switches", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", "//flutter/shell/platform/embedder:embedder_as_internal_library", "//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows", "//third_party/angle:libEGL_static", # the order of libEGL_static and @@ -148,7 +148,7 @@ copy("publish_headers_windows") { outputs = [ "$root_out_dir/{{source_file_part}}" ] # The Windows header assumes the presence of the common headers. - deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ] + deps = [ "//flutter/shell/platform/common:publish_headers" ] } shared_library("flutter_windows") { @@ -213,7 +213,7 @@ executable("flutter_windows_unittests") { ":flutter_windows_fixtures", ":flutter_windows_headers", ":flutter_windows_source", - "//flutter/shell/platform/common/cpp:common_cpp", + "//flutter/shell/platform/common:common_cpp", "//flutter/shell/platform/embedder:embedder_as_internal_library", "//flutter/shell/platform/embedder:embedder_test_utils", "//flutter/testing", diff --git a/shell/platform/windows/client_wrapper/BUILD.gn b/shell/platform/windows/client_wrapper/BUILD.gn index fe54c2ba2a484..232f8951c1263 100644 --- a/shell/platform/windows/client_wrapper/BUILD.gn +++ b/shell/platform/windows/client_wrapper/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/shell/platform/common/cpp/client_wrapper/publish.gni") +import("//flutter/shell/platform/common/client_wrapper/publish.gni") import("//flutter/testing/testing.gni") _wrapper_includes = [ @@ -23,8 +23,8 @@ _wrapper_sources = [ # directories of the core wrapper files so these includes will work. config("relative_core_wrapper_headers") { include_dirs = [ - "//flutter/shell/platform/common/cpp/client_wrapper", - "//flutter/shell/platform/common/cpp/client_wrapper/include/flutter", + "//flutter/shell/platform/common/client_wrapper", + "//flutter/shell/platform/common/client_wrapper/include/flutter", ] } @@ -34,17 +34,17 @@ source_set("client_wrapper_windows") { public = _wrapper_includes deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_library_headers", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", + "//flutter/shell/platform/common:common_cpp_library_headers", + "//flutter/shell/platform/common/client_wrapper:client_wrapper", "//flutter/shell/platform/windows:flutter_windows_headers", ] configs += - [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] + [ "//flutter/shell/platform/common:desktop_library_implementation" ] public_configs = [ ":relative_core_wrapper_headers", - "//flutter/shell/platform/common/cpp:relative_flutter_library_headers", + "//flutter/shell/platform/common:relative_flutter_library_headers", "//flutter/shell/platform/windows:relative_flutter_windows_headers", ] } @@ -88,7 +88,7 @@ executable("client_wrapper_windows_unittests") { ":client_wrapper_library_stubs_windows", ":client_wrapper_windows", ":client_wrapper_windows_fixtures", - "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs", + "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs", "//flutter/testing", # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing diff --git a/shell/platform/windows/cursor_handler.cc b/shell/platform/windows/cursor_handler.cc index 68060a08aae91..9e43b051be973 100644 --- a/shell/platform/windows/cursor_handler.cc +++ b/shell/platform/windows/cursor_handler.cc @@ -6,7 +6,7 @@ #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h" static constexpr char kChannelName[] = "flutter/mousecursor"; diff --git a/shell/platform/windows/cursor_handler.h b/shell/platform/windows/cursor_handler.h index b5775748da948..7aa75e9dc94eb 100644 --- a/shell/platform/windows/cursor_handler.h +++ b/shell/platform/windows/cursor_handler.h @@ -5,9 +5,9 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_CURSOR_HANDLER_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_CURSOR_HANDLER_H_ -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" #include "flutter/shell/platform/windows/public/flutter_windows.h" #include "flutter/shell/platform/windows/window_binding_handler.h" diff --git a/shell/platform/windows/external_texture_gl.h b/shell/platform/windows/external_texture_gl.h index a2e61f5e33ac4..731f709d50aad 100644 --- a/shell/platform/windows/external_texture_gl.h +++ b/shell/platform/windows/external_texture_gl.h @@ -9,7 +9,7 @@ #include -#include "flutter/shell/platform/common/cpp/public/flutter_texture_registrar.h" +#include "flutter/shell/platform/common/public/flutter_texture_registrar.h" #include "flutter/shell/platform/embedder/embedder.h" namespace flutter { diff --git a/shell/platform/windows/flutter_project_bundle.cc b/shell/platform/windows/flutter_project_bundle.cc index 071f1d012ef86..a88946b19fed0 100644 --- a/shell/platform/windows/flutter_project_bundle.cc +++ b/shell/platform/windows/flutter_project_bundle.cc @@ -7,8 +7,8 @@ #include #include -#include "flutter/shell/platform/common/cpp/engine_switches.h" // nogncheck -#include "flutter/shell/platform/common/cpp/path_utils.h" +#include "flutter/shell/platform/common/engine_switches.h" // nogncheck +#include "flutter/shell/platform/common/path_utils.h" namespace flutter { diff --git a/shell/platform/windows/flutter_windows.cc b/shell/platform/windows/flutter_windows.cc index 1c56965d88a5a..267983b397ebf 100644 --- a/shell/platform/windows/flutter_windows.cc +++ b/shell/platform/windows/flutter_windows.cc @@ -15,9 +15,9 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" -#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h" -#include "flutter/shell/platform/common/cpp/path_utils.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/incoming_message_dispatcher.h" +#include "flutter/shell/platform/common/path_utils.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/windows/flutter_project_bundle.h" #include "flutter/shell/platform/windows/flutter_windows_engine.h" diff --git a/shell/platform/windows/flutter_windows_engine.cc b/shell/platform/windows/flutter_windows_engine.cc index bfe169fc3a95c..c2be3492b1974 100644 --- a/shell/platform/windows/flutter_windows_engine.cc +++ b/shell/platform/windows/flutter_windows_engine.cc @@ -8,10 +8,10 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h" -#include "flutter/shell/platform/common/cpp/json_message_codec.h" -#include "flutter/shell/platform/common/cpp/path_utils.h" +#include "flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h" +#include "flutter/shell/platform/common/json_message_codec.h" +#include "flutter/shell/platform/common/path_utils.h" #include "flutter/shell/platform/windows/flutter_windows_view.h" #include "flutter/shell/platform/windows/string_conversion.h" #include "flutter/shell/platform/windows/system_utils.h" diff --git a/shell/platform/windows/flutter_windows_engine.h b/shell/platform/windows/flutter_windows_engine.h index 5e2cac869c704..a605d5a50c3e1 100644 --- a/shell/platform/windows/flutter_windows_engine.h +++ b/shell/platform/windows/flutter_windows_engine.h @@ -10,9 +10,9 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h" -#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h" +#include "flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h" +#include "flutter/shell/platform/common/incoming_message_dispatcher.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/windows/flutter_project_bundle.h" #include "flutter/shell/platform/windows/flutter_windows_texture_registrar.h" diff --git a/shell/platform/windows/flutter_windows_view.h b/shell/platform/windows/flutter_windows_view.h index c868a4c7b1ee2..75bdba645eee0 100644 --- a/shell/platform/windows/flutter_windows_view.h +++ b/shell/platform/windows/flutter_windows_view.h @@ -12,8 +12,8 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" -#include "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/geometry.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/windows/angle_surface_manager.h" #include "flutter/shell/platform/windows/cursor_handler.h" diff --git a/shell/platform/windows/flutter_windows_winuwp.cc b/shell/platform/windows/flutter_windows_winuwp.cc index 3b235f22ef344..e3385879bfe7a 100644 --- a/shell/platform/windows/flutter_windows_winuwp.cc +++ b/shell/platform/windows/flutter_windows_winuwp.cc @@ -15,8 +15,8 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" -#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/incoming_message_dispatcher.h" #include "flutter/shell/platform/windows/flutter_window_winuwp.h" // nogncheck // Returns the engine corresponding to the given opaque API handle. diff --git a/shell/platform/windows/key_event_handler.cc b/shell/platform/windows/key_event_handler.cc index a6d2e512f36bc..3d6b488bc4b82 100644 --- a/shell/platform/windows/key_event_handler.cc +++ b/shell/platform/windows/key_event_handler.cc @@ -8,7 +8,7 @@ #include -#include "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" namespace flutter { diff --git a/shell/platform/windows/key_event_handler.h b/shell/platform/windows/key_event_handler.h index 62f1b768afcd8..06ae709a91231 100644 --- a/shell/platform/windows/key_event_handler.h +++ b/shell/platform/windows/key_event_handler.h @@ -9,8 +9,8 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" #include "flutter/shell/platform/windows/keyboard_hook_handler.h" #include "flutter/shell/platform/windows/public/flutter_windows.h" #include "rapidjson/document.h" diff --git a/shell/platform/windows/key_event_handler_unittests.cc b/shell/platform/windows/key_event_handler_unittests.cc index 398afc5efc68a..a78d82ea74427 100644 --- a/shell/platform/windows/key_event_handler_unittests.cc +++ b/shell/platform/windows/key_event_handler_unittests.cc @@ -6,7 +6,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" #include "flutter/shell/platform/windows/flutter_windows_view.h" #include "flutter/shell/platform/windows/testing/test_binary_messenger.h" #include "gmock/gmock.h" diff --git a/shell/platform/windows/platform_handler.cc b/shell/platform/windows/platform_handler.cc index 6267583a80a7e..85254e5653a62 100644 --- a/shell/platform/windows/platform_handler.cc +++ b/shell/platform/windows/platform_handler.cc @@ -4,7 +4,7 @@ #include "flutter/shell/platform/windows/platform_handler.h" -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/json_method_codec.h" static constexpr char kChannelName[] = "flutter/platform"; diff --git a/shell/platform/windows/platform_handler.h b/shell/platform/windows/platform_handler.h index b7268023a8e21..dc16e8b779921 100644 --- a/shell/platform/windows/platform_handler.h +++ b/shell/platform/windows/platform_handler.h @@ -5,8 +5,8 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_HANDLER_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_HANDLER_H_ -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" #include "rapidjson/document.h" namespace flutter { diff --git a/shell/platform/windows/platform_handler_unittests.cc b/shell/platform/windows/platform_handler_unittests.cc index 78b348b8a84d0..c427ac080c7d2 100644 --- a/shell/platform/windows/platform_handler_unittests.cc +++ b/shell/platform/windows/platform_handler_unittests.cc @@ -6,8 +6,8 @@ #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/json_method_codec.h" #include "flutter/shell/platform/windows/testing/test_binary_messenger.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/shell/platform/windows/platform_handler_win32.h b/shell/platform/windows/platform_handler_win32.h index ad8ec92ed5e37..2005f75b84ee5 100644 --- a/shell/platform/windows/platform_handler_win32.h +++ b/shell/platform/windows/platform_handler_win32.h @@ -5,8 +5,8 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_HANDLER_WIN32_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_HANDLER_WIN32_H_ -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" #include "flutter/shell/platform/windows/flutter_windows_view.h" #include "flutter/shell/platform/windows/platform_handler.h" #include "rapidjson/document.h" diff --git a/shell/platform/windows/platform_handler_winuwp.h b/shell/platform/windows/platform_handler_winuwp.h index f8b2b221e1961..e067988c1415d 100644 --- a/shell/platform/windows/platform_handler_winuwp.h +++ b/shell/platform/windows/platform_handler_winuwp.h @@ -5,8 +5,8 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_HANDLER_WINUWP_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_HANDLER_WINUWP_H_ -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" #include "flutter/shell/platform/windows/flutter_windows_view.h" #include "flutter/shell/platform/windows/platform_handler.h" #include "rapidjson/document.h" diff --git a/shell/platform/windows/testing/test_binary_messenger.h b/shell/platform/windows/testing/test_binary_messenger.h index 157a1e8f1f12d..3cb38e89c1a7c 100644 --- a/shell/platform/windows/testing/test_binary_messenger.h +++ b/shell/platform/windows/testing/test_binary_messenger.h @@ -10,7 +10,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" namespace flutter { diff --git a/shell/platform/windows/text_input_manager_win32.h b/shell/platform/windows/text_input_manager_win32.h index 33c3b6d3c78c3..d7c0319412edf 100644 --- a/shell/platform/windows/text_input_manager_win32.h +++ b/shell/platform/windows/text_input_manager_win32.h @@ -11,7 +11,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/geometry.h" namespace flutter { diff --git a/shell/platform/windows/text_input_plugin.cc b/shell/platform/windows/text_input_plugin.cc index 59dbe59c63273..8d0dbc39d74e0 100644 --- a/shell/platform/windows/text_input_plugin.cc +++ b/shell/platform/windows/text_input_plugin.cc @@ -9,7 +9,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/json_method_codec.h" +#include "flutter/shell/platform/common/json_method_codec.h" #include "flutter/shell/platform/windows/flutter_windows_view.h" static constexpr char kSetEditingStateMethod[] = "TextInput.setEditingState"; diff --git a/shell/platform/windows/text_input_plugin.h b/shell/platform/windows/text_input_plugin.h index a18f025097135..41ca4b96ab7c7 100644 --- a/shell/platform/windows/text_input_plugin.h +++ b/shell/platform/windows/text_input_plugin.h @@ -9,11 +9,11 @@ #include #include -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h" -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h" -#include "flutter/shell/platform/common/cpp/geometry.h" -#include "flutter/shell/platform/common/cpp/json_method_codec.h" -#include "flutter/shell/platform/common/cpp/text_input_model.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h" +#include "flutter/shell/platform/common/geometry.h" +#include "flutter/shell/platform/common/json_method_codec.h" +#include "flutter/shell/platform/common/text_input_model.h" #include "flutter/shell/platform/windows/keyboard_hook_handler.h" #include "flutter/shell/platform/windows/public/flutter_windows.h" #include "flutter/shell/platform/windows/text_input_plugin_delegate.h" diff --git a/shell/platform/windows/text_input_plugin_delegate.h b/shell/platform/windows/text_input_plugin_delegate.h index 0fdb0ed36f726..e2c28a63a6667 100644 --- a/shell/platform/windows/text_input_plugin_delegate.h +++ b/shell/platform/windows/text_input_plugin_delegate.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TEXT_INPUT_PLUGIN_DELEGATE_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_TEXT_INPUT_PLUGIN_DELEGATE_H_ -#include "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/geometry.h" #include "flutter/shell/platform/embedder/embedder.h" namespace flutter { diff --git a/shell/platform/windows/win32_flutter_window.h b/shell/platform/windows/win32_flutter_window.h index 15fd108fb2905..25096279d24f5 100644 --- a/shell/platform/windows/win32_flutter_window.h +++ b/shell/platform/windows/win32_flutter_window.h @@ -11,7 +11,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/geometry.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/windows/flutter_windows_view.h" #include "flutter/shell/platform/windows/win32_window.h" diff --git a/shell/platform/windows/win32_flutter_window_unittests.cc b/shell/platform/windows/win32_flutter_window_unittests.cc index dadaad0ef1f53..0131d5f3d0cc2 100644 --- a/shell/platform/windows/win32_flutter_window_unittests.cc +++ b/shell/platform/windows/win32_flutter_window_unittests.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 "flutter/shell/platform/common/cpp/json_message_codec.h" +#include "flutter/shell/platform/common/json_message_codec.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h" #include "flutter/shell/platform/windows/flutter_windows_engine.h" diff --git a/shell/platform/windows/window_binding_handler.h b/shell/platform/windows/window_binding_handler.h index 9263cc5b2634b..8ebe8fa39f2df 100644 --- a/shell/platform/windows/window_binding_handler.h +++ b/shell/platform/windows/window_binding_handler.h @@ -10,7 +10,7 @@ #include #include -#include "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/geometry.h" #include "flutter/shell/platform/windows/public/flutter_windows.h" #include "flutter/shell/platform/windows/window_binding_handler_delegate.h" diff --git a/shell/platform/windows/window_binding_handler_delegate.h b/shell/platform/windows/window_binding_handler_delegate.h index dd0038f0fc194..40bd8f513dacc 100644 --- a/shell/platform/windows/window_binding_handler_delegate.h +++ b/shell/platform/windows/window_binding_handler_delegate.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_BINDING_HANDLER_DELEGATE_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_BINDING_HANDLER_DELEGATE_H_ -#include "flutter/shell/platform/common/cpp/geometry.h" +#include "flutter/shell/platform/common/geometry.h" #include "flutter/shell/platform/embedder/embedder.h" namespace flutter { diff --git a/shell/platform/windows/window_state.h b/shell/platform/windows/window_state.h index 3092a7bc0b90e..56897f7e1a269 100644 --- a/shell/platform/windows/window_state.h +++ b/shell/platform/windows/window_state.h @@ -5,8 +5,8 @@ #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_STATE_H_ #define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_STATE_H_ -#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h" -#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h" +#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h" +#include "flutter/shell/platform/common/incoming_message_dispatcher.h" #include "flutter/shell/platform/embedder/embedder.h" // Structs backing the opaque references used in the C API. From a044055508fb432ad040bcea4257e08f3f004dcf Mon Sep 17 00:00:00 2001 From: George Wright Date: Thu, 4 Feb 2021 12:51:06 -0800 Subject: [PATCH 2/2] Formatting --- shell/platform/common/client_wrapper/BUILD.gn | 3 +-- .../common/client_wrapper/include/flutter/encodable_value.h | 4 ++-- shell/platform/glfw/BUILD.gn | 3 +-- shell/platform/windows/BUILD.gn | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/shell/platform/common/client_wrapper/BUILD.gn b/shell/platform/common/client_wrapper/BUILD.gn index d301dd5251d76..660f44403ef8d 100644 --- a/shell/platform/common/client_wrapper/BUILD.gn +++ b/shell/platform/common/client_wrapper/BUILD.gn @@ -28,8 +28,7 @@ source_set("client_wrapper_library_stubs") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = - [ "//flutter/shell/platform/common:common_cpp_library_headers" ] + public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ] } test_fixtures("client_wrapper_fixtures") { diff --git a/shell/platform/common/client_wrapper/include/flutter/encodable_value.h b/shell/platform/common/client_wrapper/include/flutter/encodable_value.h index d2803613edaa9..73cd5d7d67902 100644 --- a/shell/platform/common/client_wrapper/include/flutter/encodable_value.h +++ b/shell/platform/common/client_wrapper/include/flutter/encodable_value.h @@ -63,8 +63,8 @@ class CustomEncodableValue { ~CustomEncodableValue() = default; // Allow implict conversion to std::any to allow direct use of any_cast. - operator std::any &() { return value_; } - operator const std::any &() const { return value_; } + operator std::any&() { return value_; } + operator const std::any&() const { return value_; } #if defined(FLUTTER_ENABLE_RTTI) && FLUTTER_ENABLE_RTTI // Passthrough to std::any's type(). diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn index 4e48d9a0e4dee..a0b7dbda6359f 100644 --- a/shell/platform/glfw/BUILD.gn +++ b/shell/platform/glfw/BUILD.gn @@ -19,8 +19,7 @@ config("relative_flutter_glfw_headers") { source_set("flutter_glfw_headers") { public = _public_headers - public_deps = - [ "//flutter/shell/platform/common:common_cpp_library_headers" ] + public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ] configs += [ "//flutter/shell/platform/common:desktop_library_implementation" ] diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn index 974d4b8cda193..31a0b7bd33645 100644 --- a/shell/platform/windows/BUILD.gn +++ b/shell/platform/windows/BUILD.gn @@ -26,8 +26,7 @@ config("relative_flutter_windows_headers") { source_set("flutter_windows_headers") { public = _public_headers - public_deps = - [ "//flutter/shell/platform/common:common_cpp_library_headers" ] + public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ] if (target_os == "winuwp") { configs +=