Moving the WM_SETFOCUS message processing out of FocusManager

chrome/browser/autocomplete/autocomplete_edit_view_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 "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 
 #include <locale>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 1603 matching lines @@
       model_->on_paste_replacing_all();
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted into the
     // text box.
     text_before_change_.clear();
     ReplaceSel(text.c_str(), true);
   }
 }
 
 void AutocompleteEditViewWin::OnSetFocus(HWND focus_wnd) {
+  views::FocusManager* focus_manager =
+      views::FocusManager::GetFocusManager(m_hWnd);
+  if (focus_manager) {
+    // Notify the FocusManager that the focused view is now the location bar
+    // (our parent view).
+    focus_manager->SetFocusedView(parent_view_);
+  } else {
+    NOTREACHED();
+  }
+
   model_->OnSetFocus(GetKeyState(VK_CONTROL) < 0);
 
   // Notify controller if it needs to show hint UI of some kind.
   ScopedFreeze freeze(this, GetTextObjectModel());
   if (model_->show_search_hint() ||
       (model_->is_keyword_hint() && !model_->keyword().empty()))
     controller_->OnChanged();
 
   // Restore saved selection if available.
   if (saved_selection_for_focus_change_.cpMin != -1) {
@@ skipping 678 matching lines @@
 }
 
 void AutocompleteEditViewWin::RepaintDropHighlight(int position) {
   if ((position != -1) && (position <= GetTextLength())) {
     const POINT min_loc(PosFromChar(position));
     const RECT highlight_bounds = {min_loc.x - 1, font_y_adjustment_,
         min_loc.x + 2, font_ascent_ + font_descent_ + font_y_adjustment_};
     InvalidateRect(&highlight_bounds, false);
   }
 }