Moving the WM_SETFOCUS message processing out of FocusManager

views/focus/focus_manager.h

 // 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.
 
 #ifndef VIEWS_FOCUS_FOCUS_MANAGER_H_
 #define VIEWS_FOCUS_FOCUS_MANAGER_H_
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 142 matching lines @@
 };
 
 class FocusManager {
  public:
 #if defined(OS_WIN)
   // Creates a FocusManager for the specified window. Top level windows
   // must invoked this when created.
   // The RootView specified should be the top RootView of the window.
   // This also invokes InstallFocusSubclass.
   static FocusManager* CreateFocusManager(HWND window, RootView* root_view);
-
-  // Subclasses the specified window. The subclassed window procedure listens
-  // for WM_SETFOCUS notification and keeps the FocusManager's focus owner
-  // property in sync.
-  // It's not necessary to explicitly invoke Uninstall, it's automatically done
-  // when the window is destroyed and Uninstall wasn't invoked.
-  static void InstallFocusSubclass(HWND window, View* view);
-
-  // Uninstalls the window subclass installed by InstallFocusSubclass.
-  static void UninstallFocusSubclass(HWND window);
 #endif
 
   static FocusManager* GetFocusManager(gfx::NativeView window);
 
 #if defined(OS_WIN)
   // Message handlers (for messages received from registered windows).
   // Should return true if the message should be forwarded to the window
   // original proc function, false otherwise.
   bool OnSetFocus(HWND window);
   bool OnNCDestroy(HWND window);
@@ skipping 104 matching lines @@
       const Accelerator& accelertor) const;
 
   // Convenience method that returns true if the passed |key_event| should
   // trigger tab traversal (if it is a TAB key press with or without SHIFT
   // pressed).
   static bool IsTabTraversalKeyEvent(const KeyEvent& key_event);
 
  private:
 #if defined(OS_WIN)
   explicit FocusManager(HWND root, RootView* root_view);
+
+  // Subclasses the specified window. The subclassed window procedure listens
+  // for WM_SETFOCUS notification and keeps the FocusManager's focus owner
+  // property in sync.
+  // It's not necessary to explicitly invoke Uninstall, it's automatically done
+  // when the window is destroyed and Uninstall wasn't invoked.
+  static void InstallFocusSubclass(HWND window, View* view);
+
+  // Uninstalls the window subclass installed by InstallFocusSubclass.
+  static void UninstallFocusSubclass(HWND window);
 #endif
   ~FocusManager();
 
   // Returns the next focusable view.
   View* GetNextFocusableView(View* starting_view, bool reverse, bool dont_loop);
 
   // Returns the last view of the focus traversal hierarchy.
   View* FindLastFocusableView();
 
   // Returns the focusable view found in the FocusTraversable specified starting
@@ skipping 34 matching lines @@
   // The list of registered FocusChange listeners.
   typedef std::vector<FocusChangeListener*> FocusChangeListenerList;
   FocusChangeListenerList focus_change_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManager);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_FOCUS_FOCUS_MANAGER_H_