Moving the WM_SETFOCUS message processing out of FocusManager

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 63 matching lines @@
   void OnFinalMessage(HWND hwnd) {
     if (parent_)
       parent_->NativeControlDestroyed();
     delete this;
   }
  private:
 
   LRESULT OnCreate(LPCREATESTRUCT create_struct) {
     control_ = parent_->CreateNativeControl(m_hWnd);
 
-    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_);
 
     ::ShowWindow(control_, SW_SHOW);
     return 1;
   }
@@ skipping 264 matching lines @@
                                                      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 (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 =
+        FocusManager::GetFocusManager(native_control->GetNativeControlHWND());
+    if (focus_manager) {
+      focus_manager->SetFocusedView(native_control);
+    } else {
+      NOTREACHED();
+    }
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window,
                             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