Rename

Author: clarkezone

shell/platform/windows/BUILD.gn

@@ -41,23 +41,23 @@ source_set("flutter_windows_source") {
   sources = [
     "angle_surface_manager.cc",
     "angle_surface_manager.h",
-    "dpi_utils.cc",
-    "dpi_utils.h",
     "flutter_windows.cc",
     "flutter_windows_view.cc",
     "flutter_windows_view.h",
     "key_event_handler.cc",
     "key_event_handler.h",
     "keyboard_hook_handler.h",
-    "platform_handler.cc",
-    "platform_handler.h",
     "string_conversion.cc",
     "string_conversion.h",
     "text_input_plugin.cc",
     "text_input_plugin.h",
     "window_binding_handler.h",
+    "win32_dpi_utils.cc",
+    "win32_dpi_utils.h",
     "win32_flutter_window.cc",
     "win32_flutter_window.h",
+    "win32_platform_handler.cc",
+    "win32_platform_handler.h",
     "win32_task_runner.cc",
     "win32_task_runner.h",
     "win32_window.cc",
@@ -113,12 +113,12 @@ executable("flutter_windows_unittests") {
   testonly = true
 
   sources = [
-    "dpi_utils_unittests.cc",
     "string_conversion_unittests.cc",
     "testing/win32_flutter_window_test.cc",
     "testing/win32_flutter_window_test.h",
     "testing/win32_window_test.cc",
     "testing/win32_window_test.h",
+    "win32_dpi_utils_unittests.cc",
     "win32_flutter_window_unittests.cc",
     "win32_window_unittests.cc",
   ]

shell/platform/windows/flutter_windows.cc

@@ -19,13 +19,13 @@
 #include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h"
 #include "flutter/shell/platform/common/cpp/path_utils.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/windows/dpi_utils.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 #include "flutter/shell/platform/windows/key_event_handler.h"
 #include "flutter/shell/platform/windows/keyboard_hook_handler.h"
-#include "flutter/shell/platform/windows/platform_handler.h"
 #include "flutter/shell/platform/windows/text_input_plugin.h"
+#include "flutter/shell/platform/windows/win32_dpi_utils.h"
 #include "flutter/shell/platform/windows/win32_flutter_window.h"
+#include "flutter/shell/platform/windows/win32_platform_handler.h"
 #include "flutter/shell/platform/windows/win32_task_runner.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
 #include "flutter/shell/platform/windows/window_state.h"

shell/platform/windows/flutter_windows_view.h

@@ -16,11 +16,11 @@
 #include "flutter/shell/platform/windows/angle_surface_manager.h"
 #include "flutter/shell/platform/windows/key_event_handler.h"
 #include "flutter/shell/platform/windows/keyboard_hook_handler.h"
-#include "flutter/shell/platform/windows/platform_handler.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 #include "flutter/shell/platform/windows/text_input_plugin.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
 #include "flutter/shell/platform/windows/window_state.h"
+#include "flutter/shell/platform/windows/win32_platform_handler.h"
 
 namespace flutter {
 

shell/platform/windows/dpi_utils.cc renamed to shell/platform/windows/win32_dpi_utils.cc

@@ -1,4 +1,4 @@
-#include "dpi_utils.h"
+#include "win32_dpi_utils.h"
 
 namespace flutter {
 

shell/platform/windows/dpi_utils.h renamed to shell/platform/windows/win32_dpi_utils.h

@@ -13,7 +13,7 @@ namespace flutter {
 /// backward compatible down to Windows Vista. If |hwnd| is nullptr, returns the
 /// DPI for the primary monitor. If Per-Monitor DPI awareness is not available,
 /// returns the system's DPI.
-UINT GetDpiForHWND(HWND hwnd);
+UINT GetDpiForHWND(::HWND hwnd);
 
 /// Returns the DPI of a given monitor. Defaults to 96 if the API is not
 /// available.

shell/platform/windows/dpi_utils_unittests.cc renamed to shell/platform/windows/win32_dpi_utils_unittests.cc

@@ -1,6 +1,6 @@
 #include <windows.h>
 
-#include "flutter/shell/platform/windows/dpi_utils.h"
+#include "flutter/shell/platform/windows/win32_dpi_utils.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/windows/win32_flutter_window_unittests.cc

@@ -11,7 +11,7 @@ TEST(Win32FlutterWindowTest, CreateDestroy) {
 
 TEST(Win32FlutterWindowTest, CanFontChange) {
   Win32FlutterWindowTest window(800, 600);
-  HWND hwnd = window.GetWindowHandle();
+  ::HWND hwnd = window.GetWindowHandle();
   LRESULT result = SendMessage(hwnd, WM_FONTCHANGE, NULL, NULL);
   ASSERT_EQ(result, 0);
   ASSERT_TRUE(window.OnFontChangeWasCalled());

shell/platform/windows/platform_handler.cc renamed to shell/platform/windows/win32_platform_handler.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/windows/platform_handler.h"
+#include "flutter/shell/platform/windows/win32_platform_handler.h"
 
 #include <windows.h>
 

shell/platform/windows/platform_handler.h renamed to shell/platform/windows/win32_platform_handler.h

@@ -4,7 +4,7 @@
 
 #include "flutter/shell/platform/windows/win32_window.h"
 
-#include "dpi_utils.h"
+#include "win32_dpi_utils.h"
 
 namespace flutter {
 

shell/platform/windows/win32_window.cc

@@ -10,8 +10,8 @@
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/windows/key_event_handler.h"
 #include "flutter/shell/platform/windows/keyboard_hook_handler.h"
-#include "flutter/shell/platform/windows/platform_handler.h"
 #include "flutter/shell/platform/windows/text_input_plugin.h"
+#include "flutter/shell/platform/windows/win32_platform_handler.h"
 #include "flutter/shell/platform/windows/win32_task_runner.h"
 
 namespace flutter {