Moving the WM_SETFOCUS message processing out of FocusManager

views/controls/textfield/native_textfield_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 "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/clipboard.h"
 #include "base/gfx/native_theme.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_win.h"
 #include "views/controls/textfield/textfield.h"
+#include "views/focus/focus_manager.h"
 #include "views/focus/focus_util_win.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helper classes
 
 NativeTextfieldWin::ScopedFreeze::ScopedFreeze(NativeTextfieldWin* edit,
@@ skipping 631 matching lines @@
     std::wstring collapsed(CollapseWhitespace(clipboard_str, false));
     if (textfield_->style() & Textfield::STYLE_LOWERCASE)
       collapsed = l10n_util::ToLower(collapsed);
     // Force a Paste operation to trigger OnContentsChanged, even if identical
     // contents are pasted into the text box.
     text_before_change_.clear();
     ReplaceSel(collapsed.c_str(), true);
   }
 }
 
+void NativeTextfieldWin::OnSetFocus(HWND hwnd) {
+  SetMsgHandled(FALSE);  // We still want the default processing of the message.
+
+  views::FocusManager* focus_manager =
+      views::FocusManager::GetFocusManager(m_hWnd);
+  if (!focus_manager) {
+    NOTREACHED();
+    return;
+  }
+  focus_manager->SetFocusedView(textfield_);
+}
+
 void NativeTextfieldWin::OnSysChar(TCHAR ch, UINT repeat_count, UINT flags) {
   // Nearly all alt-<xxx> combos result in beeping rather than doing something
   // useful, so we discard most.  Exceptions:
   //   * ctrl-alt-<xxx>, which is sometimes important, generates WM_CHAR instead
   //     of WM_SYSCHAR, so it doesn't need to be handled here.
   //   * alt-space gets translated by the default WM_SYSCHAR handler to a
   //     WM_SYSCOMMAND to open the application context menu, so we need to allow
   //     it through.
   if (ch == VK_SPACE)
     SetMsgHandled(false);
@@ skipping 147 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views