Add command-line option for multi-window support and refactor runner code

Author: hbatagelo

examples/multi_window_ref_app/windows/flutter/CMakeLists.txt

@@ -52,17 +52,12 @@ list(APPEND CPP_WRAPPER_SOURCES_PLUGIN
 list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/")
 list(APPEND CPP_WRAPPER_SOURCES_APP
   "flutter_engine.cc"
-  "flutter_view_controller.cc"
-  "flutter_window_controller.cc"
-  "flutter_win32_window.cc"
-  "win32_window.cc"
 )
 list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/")
 
 # Wrapper sources needed for a plugin.
 add_library(flutter_wrapper_plugin STATIC
   ${CPP_WRAPPER_SOURCES_CORE}
-  ${CPP_WRAPPER_SOURCES_WINDOWING}
   ${CPP_WRAPPER_SOURCES_PLUGIN}
 )
 apply_standard_settings(flutter_wrapper_plugin)
@@ -79,7 +74,6 @@ add_dependencies(flutter_wrapper_plugin flutter_assemble)
 # Wrapper sources needed for the runner.
 add_library(flutter_wrapper_app STATIC
   ${CPP_WRAPPER_SOURCES_CORE}
-  ${CPP_WRAPPER_SOURCES_WINDOWING}
   ${CPP_WRAPPER_SOURCES_APP}
 )
 apply_standard_settings(flutter_wrapper_app)
@@ -97,7 +91,7 @@ set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_")
 set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE)
 add_custom_command(
   OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
-    ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_WINDOWING} ${CPP_WRAPPER_SOURCES_PLUGIN}
+    ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN}
     ${CPP_WRAPPER_SOURCES_APP}
     ${PHONY_OUTPUT}
   COMMAND ${CMAKE_COMMAND} -E env
@@ -110,7 +104,6 @@ add_custom_target(flutter_assemble DEPENDS
   "${FLUTTER_LIBRARY}"
   ${FLUTTER_LIBRARY_HEADERS}
   ${CPP_WRAPPER_SOURCES_CORE}
-  ${CPP_WRAPPER_SOURCES_WINDOWING}
   ${CPP_WRAPPER_SOURCES_PLUGIN}
   ${CPP_WRAPPER_SOURCES_APP}
 )

examples/multi_window_ref_app/windows/runner/CMakeLists.txt

@@ -31,7 +31,6 @@ target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
 # Add dependency libraries and include directories. Add any application-specific
 # dependencies here.
 target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
-target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
 target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
 
 # Run the Flutter tool portions of the build. This must not be removed.

examples/multi_window_ref_app/windows/runner/Runner.rc

@@ -52,7 +52,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-// IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
+IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -90,12 +90,12 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "The Flutter Authors" "\0"
-            VALUE "FileDescription", "A sample application demonstrating Flutter APIs." "\0"
+            VALUE "FileDescription", "A reference application demonstrating Flutter's multi-window API." "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
-            VALUE "InternalName", "Flutter API Sample" "\0"
+            VALUE "InternalName", "Flutter Multi-Window Reference App" "\0"
             VALUE "LegalCopyright", "Copyright 2014 The Flutter Authors. All rights reserved." "\0"
-            VALUE "OriginalFilename", "flutter_api_samples.exe" "\0"
-            VALUE "ProductName", "Flutter API Sample" "\0"
+            VALUE "OriginalFilename", "multi_window_ref_app.exe" "\0"
+            VALUE "ProductName", "Flutter Multi-Window Reference App" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
     END

examples/multi_window_ref_app/windows/runner/flutter_window.cpp

@@ -1,8 +1,6 @@
 #include <flutter/generated_plugin_registrant.h>
-#include <flutter/method_channel.h>
 #include <flutter/dart_project.h>
-#include <flutter/flutter_window_controller.h>
-#include <windows.h>
+#include <flutter/flutter_engine.h>
 
 #include "utils.h"
 
@@ -26,7 +24,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
 
   auto const engine{std::make_shared<flutter::FlutterEngine>(project)};
   RegisterPlugins(engine.get());
-  flutter::FlutterWindowController::GetInstance().SetEngine(engine);
   engine->Run();
 
   ::MSG msg;