2 files changed, 1 insertions, 17 deletions
diff --git a/app/win/window_impl.cc b/app/win/window_impl.cc
index 8ddd2bc..b28eab5 100644
--- a/app/win/window_impl.cc
+++ b/app/win/window_impl.cc
@@ -180,15 +180,7 @@ LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd,
   if (!window)
     return 0;
 
-  LRESULT return_code = window->OnWndProc(message, w_param, l_param);
-
-  // Clean up state.  Do this after the above call so subclasses still have a
-  // valid hwnd().  Can't wait until WM_NCDESTROY because by then |hwnd| is not
-  // guaranteed to be reported to us.
-  if (message == WM_DESTROY)
-    window->OnDestroy();
-
-  return return_code;
+  return window->OnWndProc(message, w_param, l_param);
 }
 
 std::wstring WindowImpl::GetWindowClassName() {
@@ -219,8 +211,4 @@ std::wstring WindowImpl::GetWindowClassName() {
   return name;
 }
 
-void WindowImpl::OnDestroy() {
-  hwnd_ = 0;
-}
-
 }  // namespace app
diff --git a/app/win/window_impl.h b/app/win/window_impl.h
index dd7ef5a..fb5d512 100644
--- a/app/win/window_impl.h
+++ b/app/win/window_impl.h
@@ -87,10 +87,6 @@ class WindowImpl : public MessageMapInterface {
   // If necessary, this registers the window class.
   std::wstring GetWindowClassName();
 
-  // Called when the HWND gets a WM_DESTROY message; should cause us to clean
-  // up any state.
-  void OnDestroy();
-
   // All classes registered by WidgetWin start with this name.
   static const wchar_t* const kBaseClassName;