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 524 matching lines @@
                      trailing_width);
   return min_size;
 }
 
 void LocationBarView::Layout() {
   if (!IsInitialized())
     return;
 
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
   keyword_hint_view_->SetVisible(false);

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

Might be clearer to set the visibility here based on the conditions currently
below, then just check visible() down there, as we do for most of these other
views.

This could then be factored out to a helper function called
UpdatedKeywordHintVisibility().  We could call that here, and the focus/blur
handlers could call that + schedule a paint, and not need to relayout.  (We know
not doing a relayout is safe because this view is the innermost thing on the
trailing edge, and autocollapses, so no other view positions or sizes are based
on its visibility.)

 
   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() &&
-      !omnibox_view_->IsImeComposing()) {
-    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);
+  if (HasFocus() && !keyword.empty() && omnibox_view_->model()->is_keyword_hint() &&

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

80 columns

+          !omnibox_view_->IsImeComposing()) {

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

Spaces, not tabs

+          trailing_decorations.AddDecoration(vertical_padding, location_height, true,
+                  0, item_padding, item_padding,
+                  keyword_hint_view_);
+          if (keyword_hint_view_->keyword() != keyword) 

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

Do not add trailing space

+            keyword_hint_view_->SetKeyword(keyword);
   }
+ 

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

Do not add second blank line

 
   // Perform layout.
   int full_width = width() - (2 * edge_thickness);
 
   int entry_width = full_width;
   leading_decorations.LayoutPass1(&entry_width);
   trailing_decorations.LayoutPass1(&entry_width);
   leading_decorations.LayoutPass2(&entry_width);
   trailing_decorations.LayoutPass2(&entry_width);
 
@@ skipping 669 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();
 }