Reverting 9109.

chrome/views/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 "chrome/views/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
@@ skipping 61 matching lines @@
   }
 
   void OnFinalMessage(HWND hwnd) {
     if (parent_)
       parent_->NativeControlDestroyed();
     delete this;
   }
  private:
 
   LRESULT OnCreate(LPCREATESTRUCT create_struct) {
-    TRACK_HWND_CREATION(m_hWnd);
-
     control_ = parent_->CreateNativeControl(m_hWnd);
-    TRACK_HWND_CREATION(control_);
-
     FocusManager::InstallFocusSubclass(control_, parent_);
-
-    // We subclass the control hwnd so we get the WM_KEYDOWN messages.
-    WNDPROC original_handler =
-        win_util::SetWindowProc(control_,
-                                &NativeControl::NativeControlWndProc);
-    SetProp(control_, kHandlerKey, original_handler);
-    SetProp(control_, kNativeControlKey , parent_);
-
+    if (parent_->NotifyOnKeyDown()) {
+      // We subclass the control hwnd so we get the WM_KEYDOWN messages.
+      WNDPROC original_handler =
+          win_util::SetWindowProc(control_,
+                                  &NativeControl::NativeControlWndProc);
+      SetProp(control_, kHandlerKey, original_handler);
+      SetProp(control_, kNativeControlKey , parent_);
+    }
     ::ShowWindow(control_, SW_SHOW);
     return 1;
   }
 
   LRESULT OnEraseBkgnd(HDC dc) {
     return 1;
   }
 
   void OnPaint(HDC ignore) {
     PAINTSTRUCT ps;
@@ skipping 12 matching lines @@
   LRESULT OnNotify(int w_param, LPNMHDR l_param) {
     if (parent_)
       return parent_->OnNotify(w_param, l_param);
     else
       return 0;
   }
 
   void OnDestroy() {
     if (parent_)
       parent_->OnDestroy();
-    TRACK_HWND_DESTRUCTION(m_hWnd);
   }
 
   void OnContextMenu(HWND window, const CPoint& location) {
     if (parent_)
       parent_->OnContextMenu(location);
   }
 
   // We need to find an ancestor with a non-null background, and
   // ask it for a (solid color) brush that approximates
   // the background.  The caller will use this when drawing
@@ skipping 222 matching lines @@
 // static
 LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window, UINT message,
                                                      WPARAM w_param,
                                                      LPARAM l_param) {
   HANDLE original_handler = GetProp(window, kHandlerKey);
   DCHECK(original_handler);
   NativeControl* native_control =
       static_cast<NativeControl*>(GetProp(window, kNativeControlKey));
   DCHECK(native_control);
 
-  if (message == WM_KEYDOWN && native_control->NotifyOnKeyDown()) {
+  if (message == WM_KEYDOWN) {
     if (native_control->OnKeyDown(static_cast<int>(w_param)))
       return 0;
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window,
                             reinterpret_cast<WNDPROC>(original_handler));
     RemoveProp(window, kHandlerKey);
     RemoveProp(window, kNativeControlKey);
-    TRACK_HWND_DESTRUCTION(window);
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views