Fix a bug that viewed Omnibox hint when hint loses focus

chrome/browser/ui/views/omnibox/omnibox_view_views.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/omnibox/omnibox_view_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 756 matching lines @@
   views::Textfield::OnFocus();
   // TODO(oshima): Get control key state.
   model()->OnSetFocus(false);
   // Don't call controller()->OnSetFocus, this view has already acquired focus.
 
   // Restore the selection we saved in OnBlur() if it's still valid.
   if (saved_selection_for_focus_change_.IsValid()) {
     SelectRange(saved_selection_for_focus_change_);
     saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
   }
+
+  // Re-focusing, keyword hint is visible.

[Peter Kasting, 2017/03/07 04:11:23]

Nit: Use the same comment here as you changed to below.

+  if (model()->is_keyword_hint())
+    location_bar_view_->Layout();
 }
 
 void OmniboxViewViews::OnBlur() {
   // Save the user's existing selection to restore it later.
   saved_selection_for_focus_change_ = GetSelectedRange();
 
   views::Textfield::OnBlur();
   model()->OnWillKillFocus();
 
   // If ZeroSuggest is active, we may have refused to show an update to the
   // underlying permanent URL that happened while the popup was open, so
   // revert to ensure that update is shown now.  Otherwise, make sure to call
   // CloseOmniboxPopup() unconditionally, so that if ZeroSuggest is in the midst
   // of running but hasn't yet opened the popup, it will be halted.
   if (!model()->user_input_in_progress() && model()->popup_model()->IsOpen())
     RevertAll();
   else
     CloseOmniboxPopup();
 
   // Tell the model to reset itself.
   model()->OnKillFocus();
 
   // Make sure the beginning of the text is visible.
   SelectRange(gfx::Range(0));
 
+  // Focus changes can affect the visibility of any keyword hint.
+  if (model()->is_keyword_hint())
+    location_bar_view_->Layout();
+
   // The location bar needs to repaint without a focus ring.
   location_bar_view_->SchedulePaint();
 }
 
 bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const {
   if (command_id == IDS_APP_PASTE)
     return !read_only() && !GetClipboardText().empty();
   if (command_id == IDS_PASTE_AND_GO)
     return !read_only() && model()->CanPasteAndGo(GetClipboardText());
   return Textfield::IsCommandIdEnabled(command_id) ||
@@ skipping 253 matching lines @@
       paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO);
 
   menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }