Fix omnibox focus ring regression on Windows.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2012 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/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 1423 matching lines @@
 
 void LocationBarView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   InstantServiceFactory::GetForProfile(profile())->OnOmniboxStartMarginChanged(
       bounds().x());
 
   OmniboxPopupView* popup = omnibox_view_->model()->popup_model()->view();
   if (popup->IsOpen())
     popup->UpdatePopupAppearance();
 }
 
+void LocationBarView::OnFocus() {
+  // Explicitly focus the omnibox so a focus ring will be displayed around it on
+  // Windows.
+  omnibox_view_->SetFocus();
+}
+
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   // Fill the location bar background color behind the border.  Parts of the
   // border images are meant to rest atop the toolbar background and parts atop
   // the omnibox background, so we can't just blindly fill our entire bounds.
   gfx::Rect bounds(GetContentsBounds());
   bounds.Inset(GetHorizontalEdgeThickness(), vertical_edge_thickness());
   SkColor color(GetColor(ToolbarModel::NONE, BACKGROUND));
   if (is_popup_mode_) {
@@ skipping 216 matching lines @@
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }