Reverting 27113.

views/controls/native_control.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
@@ skipping 268 matching lines @@
 }
 
 HWND NativeControl::GetNativeControlHWND() {
   if (container_)
     return container_->GetControl();
   else
     return NULL;
 }
 
 void NativeControl::NativeControlDestroyed() {
+  if (hwnd_view_)
+    hwnd_view_->Detach();
   container_ = NULL;
 }
 
 void NativeControl::SetVisible(bool f) {
   if (f != IsVisible()) {
     View::SetVisible(f);
     if (!f && container_) {
       ::DestroyWindow(*container_);
     } else if (f && !container_) {
       ValidateNativeControl();
@@ skipping 77 matching lines @@
                             reinterpret_cast<WNDPROC>(original_handler));
     RemoveProp(window, kHandlerKey);
     RemoveProp(window, kNativeControlKey);
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views