Roll back this change.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6279 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 10 deletions

diff --git a/chrome/views/widget_win.cc b/chrome/views/widget_win.cc
index 2707894..cd0e913 100644
--- a/chrome/views/widget_win.cc
+++ b/chrome/views/widget_win.cc
@@ -132,6 +132,7 @@ WidgetWin::WidgetWin()
 }
 
 WidgetWin::~WidgetWin() {
+  MessageLoopForUI::current()->RemoveObserver(this);
 }
 
 void WidgetWin::Init(HWND parent, const gfx::Rect& bounds,
@@ -549,16 +550,6 @@ LRESULT WidgetWin::OnMouseRange(UINT msg, WPARAM w_param, LPARAM l_param) {
   return 0;
 }
 
-void WidgetWin::OnNCDestroy() {
-  // Destroy the view hierarchy here as the window is destroyed, _before_ the
-  // Widget is destroyed and before our associated focus manager is destroyed.
-  // Views in the view hierarchy may attempt to manipulate the focus manager or
-  // other aspects of the window in ways that are not compatible with the fact
-  // that it has just been destroyed.
-  MessageLoopForUI::current()->RemoveObserver(this);
-  root_view_.reset(NULL);
-}
-
 void WidgetWin::OnNCLButtonDblClk(UINT flags, const CPoint& point) {
   SetMsgHandled(FALSE);
 }