Moving the WM_SETFOCUS message processing out of FocusManager

views/focus/focus_manager.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/focus/focus_manager.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 
@@ skipping 53 matching lines @@
   }
 
   WNDPROC original_handler = win_util::GetSuperclassWNDPROC(window);
   DCHECK(original_handler);
   FocusManager* focus_manager = FocusManager::GetFocusManager(window);
   // There are cases when we have no FocusManager for the window. This happens
   // because we subclass certain windows (such as the TabContents window)
   // but that window may not have an associated FocusManager.
   if (focus_manager) {
     switch (message) {
-      case WM_SETFOCUS:
-        if (!focus_manager->OnSetFocus(window))
-          return 0;
-        break;
       case WM_NCDESTROY:
         if (!focus_manager->OnNCDestroy(window))
           return 0;
         break;
       default:
         break;
     }
   }
   return CallWindowProc(original_handler, window, message, wParam, lParam);
 }
@@ skipping 94 matching lines @@
 #endif
 
 FocusManager::~FocusManager() {
   // If there are still registered FocusChange listeners, chances are they were
   // leaked so warn about them.
   DCHECK(focus_change_listeners_.empty());
 }
 
 #if defined(OS_WIN)
 // Message handlers.
-bool FocusManager::OnSetFocus(HWND window) {
-  if (ignore_set_focus_msg_)
-    return true;
-
-  // Focus the view associated with that window.
-  View* v = static_cast<View*>(GetProp(window, kViewKey));
-  if (v && v->IsFocusable()) {
-    v->GetRootView()->FocusView(v);
-  } else {
-    SetFocusedView(NULL);
-  }
-
-  return true;
-}
-
 bool FocusManager::OnNCDestroy(HWND window) {
   // Window is being destroyed, undo the subclassing.
   FocusManager::UninstallFocusSubclass(window);
 
   if (window == root_) {
     // We are the top window.
 
     DCHECK(GetProp(window, kFocusManagerKey));
 
     // Make sure this is called on the window that was set with the
@@ skipping 505 matching lines @@
       std::find(focus_change_listeners_.begin(), focus_change_listeners_.end(),
                 listener);
   if (place == focus_change_listeners_.end()) {
     NOTREACHED() << "Removing a listener that isn't registered.";
     return;
   }
   focus_change_listeners_.erase(place);
 }
 
 }  // namespace views