Re-display chrome:// page location icon label after aborted search

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index c05e17d1005671e6b577b98b74c0150bd115546e..f8fcc1ac5c3711262939ad01ff92a1495443f511 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -874,11 +874,11 @@ base::string16 LocationBarView::GetLocationIconText() const {
 
 bool LocationBarView::ShouldShowKeywordBubble() const {
   return !omnibox_view_->model()->keyword().empty() &&
-      !omnibox_view_->model()->is_keyword_hint();
+         !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarView::ShouldShowLocationIconText() const {
-  if (!GetOmniboxView()->IsEditingOrEmpty() &&
+  if (!GetToolbarModel()->input_in_progress() &&
       (GetToolbarModel()->GetURL().SchemeIs(content::kChromeUIScheme) ||
        GetToolbarModel()->GetURL().SchemeIs(extensions::kExtensionScheme)))
     return true;