Reverting 27113.

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 851 matching lines @@
   if (something_changed && text_differs)
     TextChanged();
 
   return something_changed;
 }
 
 gfx::NativeView AutocompleteEditViewWin::GetNativeView() const {
   return m_hWnd;
 }
 
-gfx::NativeView AutocompleteEditViewWin::GetFocusNativeView() const {
-  return m_hWnd;
-}
-
 void AutocompleteEditViewWin::PasteAndGo(const std::wstring& text) {
   if (CanPasteAndGo(text))
     model_->PasteAndGo();
 }
 
 bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& e) {
   int c = e.GetCharacter();
   // We don't process ALT + numpad digit as accelerators, they are used for
   // entering special characters.  We do translate alt-home.
@@ skipping 747 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 = parent_view_->GetFocusManager();
+  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 717 matching lines @@
     context_menu_contents_->AddItemWithStringId(IDS_PASTE_AND_GO,
                                                 IDS_PASTE_AND_GO);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL, IDS_SELECT_ALL);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
   }
   context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
 }