Fix a bug that viewed Omnibox hint when hint loses focus

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 518 matching lines @@
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i)
     trailing_width += IncrementalMinimumWidth((*i));
 
   min_size.set_width(leading_width + omnibox_view_->GetMinimumSize().width() +
                      2 * padding - omnibox_view_->GetInsets().width() +
                      trailing_width);
   return min_size;
 }
 
+void LocationBarView::UpdatedKeywordHintVisibility() {

[Peter Kasting, 2016/10/02 19:01:37]

Nit: Update, not Updated

+  keyword_hint_view_->SetVisible(HasFocus());
+}
+
 void LocationBarView::Layout() {
   if (!IsInitialized())
     return;
 
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
-  keyword_hint_view_->SetVisible(false);
+  // keyword_hint_view_->SetVisible(false);

[Peter Kasting, 2016/10/02 19:01:37]

This needs to call UpdateKeywordHintVisibility().

 
   const int item_padding = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
   const int edge_thickness = GetHorizontalEdgeThickness();
 
   LocationBarLayout leading_decorations(
       LocationBarLayout::LEFT_EDGE, item_padding,
       item_padding - omnibox_view_->GetInsets().left());
   LocationBarLayout trailing_decorations(
       LocationBarLayout::RIGHT_EDGE, item_padding,
       item_padding - omnibox_view_->GetInsets().right());
@@ skipping 74 matching lines @@
            content_setting_views_.rbegin()); i != content_setting_views_.rend();
        ++i) {
     if ((*i)->visible()) {
       trailing_decorations.AddDecoration(vertical_padding, location_height,
                                          false, 0, item_padding, item_padding,
                                          *i);
     }
   }
   // Because IMEs may eat the tab key, we don't show "press tab to search" while
   // IME composition is in progress.
-  if (!keyword.empty() && omnibox_view_->model()->is_keyword_hint() &&
+  if (keyword_hint_view_->visible() && !keyword.empty() &&
+      omnibox_view_->model()->is_keyword_hint() &&
       !omnibox_view_->IsImeComposing()) {

[Peter Kasting, 2016/10/02 19:01:37]

You need all this logic to go in UpdateKeywordHintVisibility(), not just the
focus check.

     trailing_decorations.AddDecoration(vertical_padding, location_height, true,
                                        0, item_padding, item_padding,
                                        keyword_hint_view_);
     if (keyword_hint_view_->keyword() != keyword)
       keyword_hint_view_->SetKeyword(keyword);
   }
 
   // Perform layout.
   int full_width = width() - (2 * edge_thickness);
 
@@ skipping 565 matching lines @@
 }
 
 void LocationBarView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   OmniboxPopupView* popup = omnibox_view_->model()->popup_model()->view();
   if (popup->IsOpen())
     popup->UpdatePopupAppearance();
 }
 
 void LocationBarView::OnFocus() {
   omnibox_view_->SetFocus();
+  UpdatedKeywordHintVisibility();
+}
+
+void LocationBarView::OnBlur() {
+  UpdatedKeywordHintVisibility();
 }
 
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   if (show_focus_rect_ && omnibox_view_->HasFocus()) {
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setColor(GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::NativeTheme::kColorId_FocusedBorderColor));
@@ skipping 90 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }