Reverting 27113.

views/controls/native_control_win.cc

 // Copyright (c) 2009 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_win.h"
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "views/focus/focus_manager.h"
 
 namespace views {
 
 // static
 const wchar_t* NativeControlWin::kNativeControlWinKey =
     L"__NATIVE_CONTROL_WIN__";
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, public:
 
 NativeControlWin::NativeControlWin() {
 }
 
 NativeControlWin::~NativeControlWin() {
   HWND hwnd = native_view();
   if (hwnd) {
-    // Destroy the hwnd if it still exists. Otherwise we won't shut things down
-    // correctly, leading to leaking and crashing if another message comes in
-    // for the hwnd.
+    // Destroy the hwnd if it still exists. Otherwise we won't have shut things
+    // down correctly, leading to leaking and crashing if another message
+    // comes in for the hwnd.
+    Detach();
     DestroyWindow(hwnd);
   }
 }
 
 bool NativeControlWin::ProcessMessage(UINT message, WPARAM w_param,
                                       LPARAM l_param, LRESULT* result) {
   switch (message) {
     case WM_CONTEXTMENU:
       ShowContextMenu(gfx::Point(LOWORD(l_param), HIWORD(l_param)));
       *result = 0;
@@ skipping 26 matching lines @@
   // Create the HWND when we're added to a valid Widget. Many controls need a
   // parent HWND to function properly.
   if (is_add && GetWidget() && !native_view())
     CreateNativeControl();
 }
 
 void NativeControlWin::VisibilityChanged(View* starting_from, bool is_visible) {
   if (!is_visible) {
     // We destroy the child control HWND when we become invisible because of the
     // performance cost of maintaining many HWNDs.
-    DestroyWindow(native_view());
+    HWND hwnd = native_view();
+    Detach();
+    DestroyWindow(hwnd);
   } else if (!native_view()) {
     if (GetWidget())
       CreateNativeControl();
   } else {
     // The view becomes visible after native control is created.
     // Layout now.
     Layout();
   }
 }
 
@@ skipping 20 matching lines @@
   }
   View::ShowContextMenu(x, y, is_mouse);
 }
 
 void NativeControlWin::NativeControlCreated(HWND native_control) {
   // Associate this object with the control's HWND so that WidgetWin can find
   // this object when it receives messages from it.
   // Note that we never unset this property. We don't have to.
   SetProp(native_control, kNativeControlWinKey, this);
 
+  // Subclass so we get WM_KEYDOWN and WM_SETFOCUS messages.
+  original_wndproc_ =
+      win_util::SetWindowProc(native_control,
+                              &NativeControlWin::NativeControlWndProc);
+
   Attach(native_control);
   // native_view() is now valid.
 
-  // Subclass so we get WM_KEYDOWN message.
-  original_wndproc_ =
-      win_util::SetWindowProc(native_control,
-                              &NativeControlWin::NativeControlWndProc);
-
   // Update the newly created HWND with any resident enabled state.
   EnableWindow(native_view(), IsEnabled());
 
   // This message ensures that the focus border is shown.
   SendMessage(native_view(), WM_CHANGEUISTATE,
               MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0);
 }
 
 DWORD NativeControlWin::GetAdditionalExStyle() const {
   // If the UI for the view is mirrored, we should make sure we add the
@@ skipping 41 matching lines @@
                                                UINT message,
                                                WPARAM w_param,
                                                LPARAM l_param) {
   NativeControlWin* native_control =
       static_cast<NativeControlWin*>(GetProp(window, kNativeControlWinKey));
   DCHECK(native_control);
 
   if (message == WM_KEYDOWN &&
       native_control->OnKeyDown(static_cast<int>(w_param))) {
       return 0;
+  } else if (message == WM_SETFOCUS) {
+    // Let the focus manager know that the focus changed.
+    FocusManager* focus_manager = native_control->GetFocusManager();
+    if (focus_manager) {
+      focus_manager->SetFocusedView(native_control->focus_view());
+    } else {
+      NOTREACHED();
+    }
   } else if (message == WM_DESTROY) {
-    WNDPROC old_wndproc =
-        win_util::SetWindowProc(window, native_control->original_wndproc_);
-    DCHECK(old_wndproc == &NativeControlWin::NativeControlWndProc);
+    win_util::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views