3 files changed, 3 insertions, 40 deletions
diff --git a/include/cru/platform/gui/win/Base.h b/include/cru/platform/gui/win/Base.h
index 9c253950..1ef20ffd 100644
--- a/include/cru/platform/gui/win/Base.h
+++ b/include/cru/platform/gui/win/Base.h
@@ -17,8 +17,6 @@ namespace cru::platform::gui::win {
 using platform::win::HResultError;
 using platform::win::Win32Error;
 
-class GodWindow;
-class TimerManager;
 class WinCursor;
 class WinCursorManager;
 class WindowClass;
diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h
deleted file mode 100644
index 22068ff5..00000000
--- a/include/cru/platform/gui/win/GodWindow.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-#include "Base.h"
-#include "WindowNativeMessageEventArgs.h"
-
-#include <cru/base/Event.h>
-
-#include <memory>
-
-namespace cru::platform::gui::win {
-class CRU_WIN_GUI_API GodWindow : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG("GodWindow")
-
- public:
-  explicit GodWindow(WinUiApplication* application);
-  ~GodWindow() override;
-
-  HWND GetHandle() const { return hwnd_; }
-
-  bool HandleGodWindowMessage(HWND hwnd, UINT msg, WPARAM w_param,
-                              LPARAM l_param, LRESULT* result);
-
-  IEvent<WindowNativeMessageEventArgs&>* MessageEvent() {
-    return &message_event_;
-  }
-
- private:
-  WinUiApplication* application_;
-
-  std::unique_ptr<WindowClass> god_window_class_;
-  HWND hwnd_;
-
-  Event<WindowNativeMessageEventArgs&> message_event_;
-};
-}  // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/UiApplication.h b/include/cru/platform/gui/win/UiApplication.h
index 9b1d011b..15c23148 100644
--- a/include/cru/platform/gui/win/UiApplication.h
+++ b/include/cru/platform/gui/win/UiApplication.h
@@ -2,6 +2,7 @@
 #include "Base.h"
 
 #include <cru/platform/gui/UiApplication.h>
+#include <cru/base/Timer.h>
 
 #include <memory>
 
@@ -59,8 +60,6 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource,
 
   HINSTANCE GetInstanceHandle() const { return instance_handle_; }
 
-  GodWindow* GetGodWindow() const { return god_window_.get(); }
-  TimerManager* GetTimerManager() const { return timer_manager_.get(); }
   WindowManager* GetWindowManager() const { return window_manager_.get(); }
 
  private:
@@ -71,8 +70,8 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource,
   std::unique_ptr<cru::platform::graphics::direct2d::DirectGraphicsFactory>
       graph_factory_;
 
-  std::unique_ptr<GodWindow> god_window_;
-  std::unique_ptr<TimerManager> timer_manager_;
+  TimerRegistry<std::function<void()>> timers_;
+
   std::unique_ptr<WindowManager> window_manager_;
 
   std::unique_ptr<WinCursorManager> cursor_manager_;