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 110 matching lines @@
       profile_(profile),
       popup_window_mode_(popup_window_mode),
       security_level_(security_state::SecurityStateModel::NONE),
       saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
       ime_composing_before_change_(false),
       delete_at_end_pressed_(false),
       location_bar_view_(location_bar),
       ime_candidate_window_open_(false),
       select_all_on_mouse_release_(false),
       select_all_on_gesture_tap_(false),
-      weak_ptr_factory_(this) {
+      weak_ptr_factory_(this){

[Peter Kasting, 2016/09/30 22:47:26]

Do not remove space

   SetBorder(views::Border::NullBorder());
   set_id(VIEW_ID_OMNIBOX);
   SetFontList(font_list);
 }
 
 OmniboxViewViews::~OmniboxViewViews() {
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager::Get()->
       RemoveCandidateWindowObserver(this);
 #endif
@@ skipping 617 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, hint is visible
+  if (model()->is_keyword_hint())
+    location_bar_view_->Layout();

[Peter Kasting, 2016/09/30 22:47:26]

Why make these calls here and not in the LocationBarView focus/blur handlers?

 }
 
 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));
 
   // The location bar needs to repaint without a focus ring.
   if (ui::MaterialDesignController::IsModeMaterial())
     location_bar_view_->SchedulePaint();
+
+  // Hint is being visible. If losing focus, hint is invisible.
+  if (model()->is_keyword_hint())
+    location_bar_view_->Layout();
 }
 
 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) ||
          location_bar_view_->command_updater()->IsCommandEnabled(command_id);
 }
@@ skipping 269 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);
 }