Rename ui/platform_window/{platform_window_handler => handlers}

Mechanical change renaming platform window's handlers subdir so making
it more consistent with the other sub-directories.

R=sky@chromium.org

Bug: None
Change-Id: I5a355b4ed70a30ae803ce96c6ffee60cbfdd0bbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2347401
Auto-Submit: Nick Yamane <nickdiego@igalia.com>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796877}

ui/ozone/platform/wayland/BUILD.gn

@@ -177,7 +177,7 @@ source_set("wayland") {
     "//ui/ozone/common",
     "//ui/ozone/public/mojom/wayland:wayland_mojom",
     "//ui/platform_window",
-    "//ui/platform_window/platform_window_handler",
+    "//ui/platform_window/handlers",
   ]
 
   if (is_linux && !is_chromeos) {
@@ -352,7 +352,7 @@ source_set("wayland_unittests") {
     "//ui/gfx/linux:test_support",
     "//ui/ozone:platform",
     "//ui/ozone:test_support",
-    "//ui/platform_window/platform_window_handler",
+    "//ui/platform_window/handlers",
   ]
 
   import("//ui/base/ui_features.gni")

ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc

@@ -35,8 +35,8 @@
 #include "ui/ozone/platform/wayland/test/test_wayland_server_thread.h"
 #include "ui/ozone/platform/wayland/test/wayland_test.h"
 #include "ui/ozone/public/platform_clipboard.h"
-#include "ui/platform_window/platform_window_handler/wm_drag_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_drop_handler.h"
+#include "ui/platform_window/handlers/wm_drag_handler.h"
+#include "ui/platform_window/handlers/wm_drop_handler.h"
 #include "ui/platform_window/platform_window_init_properties.h"
 #include "url/gurl.h"
 

ui/ozone/platform/wayland/host/wayland_toplevel_window.cc

@@ -18,7 +18,7 @@
 #include "ui/ozone/platform/wayland/host/wayland_data_drag_controller.h"
 #include "ui/ozone/platform/wayland/host/wayland_event_source.h"
 #include "ui/ozone/platform/wayland/host/wayland_window_drag_controller.h"
-#include "ui/platform_window/platform_window_handler/wm_drop_handler.h"
+#include "ui/platform_window/handlers/wm_drop_handler.h"
 
 namespace ui {
 

ui/ozone/platform/wayland/host/wayland_toplevel_window.h

@@ -8,9 +8,9 @@
 #include "build/lacros_buildflags.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/ozone/platform/wayland/host/wayland_window.h"
-#include "ui/platform_window/platform_window_handler/wm_drag_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_move_loop_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
+#include "ui/platform_window/handlers/wm_drag_handler.h"
+#include "ui/platform_window/handlers/wm_move_loop_handler.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 
 namespace ui {
 

ui/ozone/platform/wayland/host/wayland_window_drag_controller_unittest.cc

@@ -31,8 +31,8 @@
 #include "ui/ozone/platform/wayland/test/test_wayland_server_thread.h"
 #include "ui/ozone/platform/wayland/test/wayland_test.h"
 #include "ui/ozone/test/mock_platform_window_delegate.h"
+#include "ui/platform_window/handlers/wm_move_loop_handler.h"
 #include "ui/platform_window/platform_window_delegate.h"
-#include "ui/platform_window/platform_window_handler/wm_move_loop_handler.h"
 
 using testing::_;
 using testing::Mock;

ui/ozone/platform/wayland/host/wayland_window_unittest.cc

@@ -30,7 +30,7 @@
 #include "ui/ozone/platform/wayland/test/test_wayland_server_thread.h"
 #include "ui/ozone/platform/wayland/test/wayland_test.h"
 #include "ui/ozone/test/mock_platform_window_delegate.h"
-#include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 #include "ui/platform_window/platform_window_init_properties.h"
 
 using ::testing::_;

ui/ozone/platform/x11/BUILD.gn

@@ -58,7 +58,7 @@ source_set("x11") {
     "//ui/ozone:ozone_base",
     "//ui/ozone/common",
     "//ui/platform_window",
-    "//ui/platform_window/platform_window_handler",
+    "//ui/platform_window/handlers",
     "//ui/platform_window/x11",
   ]
 

ui/platform_window/platform_window_handler/BUILD.gn → ui/platform_window/handlers/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.
 
-component("platform_window_handler") {
+component("handlers") {
   output_name = "platform_window_handler_libs"
 
   sources = [

ui/platform_window/platform_window_handler/wm_drag_handler.cc → ui/platform_window/handlers/wm_drag_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 "ui/platform_window/platform_window_handler/wm_drag_handler.h"
+#include "ui/platform_window/handlers/wm_drag_handler.h"
 
 #include "ui/base/class_property.h"
 #include "ui/platform_window/platform_window.h"

ui/platform_window/platform_window_handler/wm_drag_handler.h → ui/platform_window/handlers/wm_drag_handler.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_DRAG_HANDLER_H_
-#define UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_DRAG_HANDLER_H_
+#ifndef UI_PLATFORM_WINDOW_HANDLERS_WM_DRAG_HANDLER_H_
+#define UI_PLATFORM_WINDOW_HANDLERS_WM_DRAG_HANDLER_H_
 
 #include "base/bind.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/platform_window/platform_window_handler/wm_platform_export.h"
+#include "ui/platform_window/handlers/wm_platform_export.h"
 
 namespace ui {
 class PlatformWindow;
@@ -64,4 +64,4 @@ WM_PLATFORM_EXPORT WmDragHandler* GetWmDragHandler(
 
 }  // namespace ui
 
-#endif  // UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_DRAG_HANDLER_H_
+#endif  // UI_PLATFORM_WINDOW_HANDLERS_WM_DRAG_HANDLER_H_

ui/platform_window/platform_window_handler/wm_drop_handler.cc → ui/platform_window/handlers/wm_drop_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 "ui/platform_window/platform_window_handler/wm_drop_handler.h"
+#include "ui/platform_window/handlers/wm_drop_handler.h"
 
 #include "ui/base/class_property.h"
 #include "ui/platform_window/platform_window.h"

ui/platform_window/platform_window_handler/wm_drop_handler.h → ui/platform_window/handlers/wm_drop_handler.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_DROP_HANDLER_H_
-#define UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_DROP_HANDLER_H_
+#ifndef UI_PLATFORM_WINDOW_HANDLERS_WM_DROP_HANDLER_H_
+#define UI_PLATFORM_WINDOW_HANDLERS_WM_DROP_HANDLER_H_
 
 #include <memory>
 
 #include "ui/gfx/native_widget_types.h"
-#include "ui/platform_window/platform_window_handler/wm_platform_export.h"
+#include "ui/platform_window/handlers/wm_platform_export.h"
 
 namespace gfx {
 class PointF;
@@ -61,4 +61,4 @@ WM_PLATFORM_EXPORT WmDropHandler* GetWmDropHandler(
 
 }  // namespace ui
 
-#endif  // UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_DROP_HANDLER_H_
+#endif  // UI_PLATFORM_WINDOW_HANDLERS_WM_DROP_HANDLER_H_

ui/platform_window/platform_window_handler/wm_move_loop_handler.cc → ui/platform_window/handlers/wm_move_loop_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 "ui/platform_window/platform_window_handler/wm_move_loop_handler.h"
+#include "ui/platform_window/handlers/wm_move_loop_handler.h"
 
 #include "ui/base/class_property.h"
 #include "ui/platform_window/platform_window.h"

ui/platform_window/platform_window_handler/wm_move_loop_handler.h → ui/platform_window/handlers/wm_move_loop_handler.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_MOVE_LOOP_HANDLER_H_
-#define UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_MOVE_LOOP_HANDLER_H_
+#ifndef UI_PLATFORM_WINDOW_HANDLERS_WM_MOVE_LOOP_HANDLER_H_
+#define UI_PLATFORM_WINDOW_HANDLERS_WM_MOVE_LOOP_HANDLER_H_
 
-#include "ui/platform_window/platform_window_handler/wm_platform_export.h"
+#include "ui/platform_window/handlers/wm_platform_export.h"
 
 namespace gfx {
 class Vector2d;
@@ -36,4 +36,4 @@ WM_PLATFORM_EXPORT WmMoveLoopHandler* GetWmMoveLoopHandler(
 
 }  // namespace ui
 
-#endif  // UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_MOVE_LOOP_HANDLER_H_
+#endif  // UI_PLATFORM_WINDOW_HANDLERS_WM_MOVE_LOOP_HANDLER_H_

ui/platform_window/platform_window_handler/wm_move_resize_handler.cc → ui/platform_window/handlers/wm_move_resize_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 "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 
 #include "ui/base/class_property.h"
 #include "ui/platform_window/platform_window.h"

ui/platform_window/platform_window_handler/wm_move_resize_handler.h → ui/platform_window/handlers/wm_move_resize_handler.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_MOVE_RESIZE_HANDLER_H_
-#define UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_MOVE_RESIZE_HANDLER_H_
+#ifndef UI_PLATFORM_WINDOW_HANDLERS_WM_MOVE_RESIZE_HANDLER_H_
+#define UI_PLATFORM_WINDOW_HANDLERS_WM_MOVE_RESIZE_HANDLER_H_
 
-#include "ui/platform_window/platform_window_handler/wm_platform_export.h"
+#include "ui/platform_window/handlers/wm_platform_export.h"
 
 namespace gfx {
 class Point;
@@ -60,4 +60,4 @@ WM_PLATFORM_EXPORT WmMoveResizeHandler* GetWmMoveResizeHandler(
 
 }  // namespace ui
 
-#endif  // UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_MOVE_RESIZE_HANDLER_H_
+#endif  // UI_PLATFORM_WINDOW_HANDLERS_WM_MOVE_RESIZE_HANDLER_H_

ui/platform_window/platform_window_handler/wm_platform_export.h → ui/platform_window/handlers/wm_platform_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_PLATFORM_EXPORT_H_
-#define UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_PLATFORM_EXPORT_H_
+#ifndef UI_PLATFORM_WINDOW_HANDLERS_WM_PLATFORM_EXPORT_H_
+#define UI_PLATFORM_WINDOW_HANDLERS_WM_PLATFORM_EXPORT_H_
 
 // Defines WM_PLATFORM_EXPORT so that functionality implemented by the
 // wm_platform module can be exported to consumers.
@@ -29,4 +29,4 @@
 #define WM_PLATFORM_EXPORT
 #endif
 
-#endif  // UI_PLATFORM_WINDOW_PLATFORM_WINDOW_HANDLER_WM_PLATFORM_EXPORT_H_
+#endif  // UI_PLATFORM_WINDOW_HANDLERS_WM_PLATFORM_EXPORT_H_

ui/platform_window/x11/BUILD.gn

@@ -25,7 +25,7 @@ component("x11") {
     "//ui/platform_window",
     "//ui/platform_window/common",
     "//ui/platform_window/extensions",
-    "//ui/platform_window/platform_window_handler",
+    "//ui/platform_window/handlers",
   ]
 
   defines = [ "X11_WINDOW_IMPLEMENTATION" ]

ui/platform_window/x11/x11_window.cc

@@ -28,7 +28,7 @@
 #include "ui/platform_window/common/platform_window_defaults.h"
 #include "ui/platform_window/extensions/workspace_extension_delegate.h"
 #include "ui/platform_window/extensions/x11_extension_delegate.h"
-#include "ui/platform_window/platform_window_handler/wm_drop_handler.h"
+#include "ui/platform_window/handlers/wm_drop_handler.h"
 #include "ui/platform_window/x11/x11_topmost_window_finder.h"
 #include "ui/platform_window/x11/x11_window_manager.h"
 

ui/platform_window/x11/x11_window.h

@@ -14,10 +14,10 @@
 #include "ui/gfx/x/event.h"
 #include "ui/platform_window/extensions/workspace_extension.h"
 #include "ui/platform_window/extensions/x11_extension.h"
+#include "ui/platform_window/handlers/wm_drag_handler.h"
+#include "ui/platform_window/handlers/wm_move_loop_handler.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/platform_window/platform_window_handler/wm_drag_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_move_loop_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
 #include "ui/platform_window/platform_window_init_properties.h"
 #include "ui/platform_window/x11/x11_window_export.h"
 

ui/views/BUILD.gn

@@ -724,7 +724,7 @@ component("views") {
       "//ui/aura",
       "//ui/events",
       "//ui/platform_window",
-      "//ui/platform_window/platform_window_handler",
+      "//ui/platform_window/handlers",
       "//ui/touch_selection",
       "//ui/wm",
       "//ui/wm/public",
@@ -1164,7 +1164,7 @@ test("views_unittests") {
     "//ui/gl:test_support",
     "//ui/native_theme",
     "//ui/native_theme:test_support",
-    "//ui/platform_window/platform_window_handler",
+    "//ui/platform_window/handlers",
     "//ui/resources",
     "//ui/resources:ui_test_pak",
     "//ui/strings",
@@ -1380,7 +1380,7 @@ source_set("views_interactive_ui_tests") {
     deps += [
       "//ui/events/platform",
       "//ui/platform_window",
-      "//ui/platform_window/platform_window_handler",
+      "//ui/platform_window/handlers",
     ]
   }
 

ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h

@@ -15,8 +15,8 @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/platform_window/platform_window_handler/wm_drag_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_drop_handler.h"
+#include "ui/platform_window/handlers/wm_drag_handler.h"
+#include "ui/platform_window/handlers/wm_drop_handler.h"
 #include "ui/views/views_export.h"
 
 namespace aura {

ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_unittest.cc

@@ -14,9 +14,9 @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/platform_window/handlers/wm_drag_handler.h"
+#include "ui/platform_window/handlers/wm_drop_handler.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/platform_window/platform_window_handler/wm_drag_handler.h"
-#include "ui/platform_window/platform_window_handler/wm_drop_handler.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"

ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc

@@ -19,7 +19,7 @@
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/platform_window/extensions/x11_extension.h"
-#include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 #include "ui/platform_window/platform_window_init_properties.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/views_delegate.h"

ui/views/widget/desktop_aura/desktop_window_tree_host_linux_interactive_uitest.cc

@@ -7,8 +7,8 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_tree_host_platform.h"
 #include "ui/base/hit_test.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/window_event_filter_linux.h"

ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc

@@ -21,8 +21,8 @@
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/platform_window/extensions/workspace_extension.h"
+#include "ui/platform_window/handlers/wm_move_loop_handler.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/platform_window/platform_window_handler/wm_move_loop_handler.h"
 #include "ui/platform_window/platform_window_init_properties.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h"

ui/views/widget/desktop_aura/window_event_filter_linux.cc

@@ -14,7 +14,7 @@
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
-#include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
+#include "ui/platform_window/handlers/wm_move_resize_handler.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
 #include "ui/views/widget/native_widget_aura.h"