Focus comes on the 'close button' in find bar when selecting 'Enter' key.

chrome/browser/ui/views/find_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/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 388 matching lines @@
   switch (sender->tag()) {
     case FIND_PREVIOUS_TAG:
     case FIND_NEXT_TAG:
       if (!find_text_->text().empty()) {
         FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(
             find_bar_host()->GetFindBarController()->web_contents());
         find_tab_helper->StartFinding(find_text_->text(),
                                       sender->tag() == FIND_NEXT_TAG,
                                       false);  // Not case sensitive.
       }
-      if (event.IsMouseEvent()) {
-        // If mouse event, we move the focus back to the text-field, so that the
-        // user doesn't have to click on the text field to change the search. We
-        // don't want to do this for keyboard clicks on the button, since the
-        // user is more likely to press FindNext again than change the search
-        // query.
-        find_text_->RequestFocus();
-      }
+      // Move focus to the find textfield.
+      find_text_->RequestFocus();
       break;
     case CLOSE_TAG:
       find_bar_host()->GetFindBarController()->EndFindSession(
           FindBarController::kKeepSelectionOnPage,
           FindBarController::kKeepResultsInFindBox);
       break;
     default:
       NOTREACHED() << L"Unknown button";
       break;
   }
@@ skipping 234 matching lines @@
 void FindBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (!ui::MaterialDesignController::IsModeMaterial())
     return;
 
   SkColor color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
   set_background(views::Background::CreateSolidBackground(color));
   match_count_text_->SetBackgroundColor(color);
   match_count_text_->SetEnabledColor(kMatchTextColorMD);
 }