From ca62e045f99b2b16c05610f1fca17de95d9f8e0f Mon Sep 17 00:00:00 2001
From: schectman <schectman@google.com>
Date: Tue, 6 Dec 2022 12:35:42 -0500
Subject: [PATCH] Remove unneeded windowsx_shim imports

---
 shell/platform/windows/flutter_window.h                      | 1 -
 shell/platform/windows/flutter_windows_view.h                | 1 -
 shell/platform/windows/testing/mock_text_input_manager.h     | 1 -
 shell/platform/windows/testing/mock_window.h                 | 1 -
 shell/platform/windows/testing/mock_window_binding_handler.h | 1 -
 shell/platform/windows/testing/test_keyboard.cc              | 1 -
 shell/platform/windows/testing/wm_builders.h                 | 2 --
 7 files changed, 8 deletions(-)

diff --git a/shell/platform/windows/flutter_window.h b/shell/platform/windows/flutter_window.h
index 3f66622b58f46..e80d98b801d6d 100644
--- a/shell/platform/windows/flutter_window.h
+++ b/shell/platform/windows/flutter_window.h
@@ -14,7 +14,6 @@
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 #include "flutter/shell/platform/windows/window.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
-#include "flutter/shell/platform/windows/windowsx_shim.h"
 
 namespace flutter {
 
diff --git a/shell/platform/windows/flutter_windows_view.h b/shell/platform/windows/flutter_windows_view.h
index cac647ea04721..2c0c719953f7c 100644
--- a/shell/platform/windows/flutter_windows_view.h
+++ b/shell/platform/windows/flutter_windows_view.h
@@ -26,7 +26,6 @@
 #include "flutter/shell/platform/windows/window_binding_handler.h"
 #include "flutter/shell/platform/windows/window_binding_handler_delegate.h"
 #include "flutter/shell/platform/windows/window_state.h"
-#include "flutter/shell/platform/windows/windowsx_shim.h"
 
 namespace flutter {
 
diff --git a/shell/platform/windows/testing/mock_text_input_manager.h b/shell/platform/windows/testing/mock_text_input_manager.h
index 13e2427ca6b58..e51d218273207 100644
--- a/shell/platform/windows/testing/mock_text_input_manager.h
+++ b/shell/platform/windows/testing/mock_text_input_manager.h
@@ -9,7 +9,6 @@
 #include <optional>
 
 #include "flutter/shell/platform/windows/text_input_manager.h"
-#include "flutter/shell/platform/windows/windowsx_shim.h"
 #include "gmock/gmock.h"
 
 namespace flutter {
diff --git a/shell/platform/windows/testing/mock_window.h b/shell/platform/windows/testing/mock_window.h
index 483404c06a0c9..78fabc663c1cf 100644
--- a/shell/platform/windows/testing/mock_window.h
+++ b/shell/platform/windows/testing/mock_window.h
@@ -7,7 +7,6 @@
 
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
 #include "flutter/shell/platform/windows/window.h"
-#include "flutter/shell/platform/windows/windowsx_shim.h"
 #include "gmock/gmock.h"
 
 namespace flutter {
diff --git a/shell/platform/windows/testing/mock_window_binding_handler.h b/shell/platform/windows/testing/mock_window_binding_handler.h
index 04ebf734782cf..2fc5cbd77e905 100644
--- a/shell/platform/windows/testing/mock_window_binding_handler.h
+++ b/shell/platform/windows/testing/mock_window_binding_handler.h
@@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_BINDING_HANDLER_H_
 
 #include "flutter/shell/platform/windows/window_binding_handler.h"
-#include "flutter/shell/platform/windows/windowsx_shim.h"
 #include "gmock/gmock.h"
 
 namespace flutter {
diff --git a/shell/platform/windows/testing/test_keyboard.cc b/shell/platform/windows/testing/test_keyboard.cc
index 92389b9bf5141..d752f027c80c0 100644
--- a/shell/platform/windows/testing/test_keyboard.cc
+++ b/shell/platform/windows/testing/test_keyboard.cc
@@ -5,7 +5,6 @@
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
 #include "flutter/shell/platform/common/json_message_codec.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
-#include "flutter/shell/platform/windows/windowsx_shim.h"
 
 #include <rapidjson/document.h>
 
diff --git a/shell/platform/windows/testing/wm_builders.h b/shell/platform/windows/testing/wm_builders.h
index a60732394afe2..49b78035b7e01 100644
--- a/shell/platform/windows/testing/wm_builders.h
+++ b/shell/platform/windows/testing/wm_builders.h
@@ -8,8 +8,6 @@
 #include <stdint.h>
 #include <windows.h>
 
-#include "flutter/shell/platform/windows/windowsx_shim.h"
-
 namespace flutter {
 namespace testing {