Revert of Refactor X11ForeignWindowManager

ui/views/widget/desktop_aura/x11_desktop_handler.cc

Index: ui/views/widget/desktop_aura/x11_desktop_handler.cc
diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
index 3fd219e8b8a720b5a0a09a5a93dd3895b6ddef6f..0e2855d4dbd8683aa0ad7d90dd65be96a8266bb4 100644
--- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc
+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -11,6 +11,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/x/x11_foreign_window_manager.h"
 #include "ui/base/x/x11_menu_list.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/platform/platform_event_source.h"
@@ -139,6 +140,11 @@
   } else {
     ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window);
   }
+
+  if (event_type == DestroyNotify) {
+    // Notify the XForeignWindowManager that |window| has been destroyed.
+    ui::XForeignWindowManager::GetInstance()->OnWindowDestroyed(window);
+  }
 }
 
 }  // namespace views