Use the Blank Page icon when editing a non-search Omnibox query.

components/omnibox/browser/omnibox_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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "components/omnibox/browser/omnibox_view.h"
 
 #include <utility>
@@ skipping 74 matching lines @@
   int id = AutocompleteMatch::TypeToIcon(model_.get() ?
       model_->CurrentTextType() : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
   return (id == IDR_OMNIBOX_HTTP) ? IDR_LOCATION_BAR_HTTP : id;
 }
 
 gfx::VectorIconId OmniboxView::GetVectorIcon() const {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   if (!IsEditingOrEmpty())
     return controller_->GetToolbarModel()->GetVectorIcon();
 
-  // Reuse the dropdown icons...
-  gfx::VectorIconId id = AutocompleteMatch::TypeToVectorIcon(
+  return AutocompleteMatch::TypeToVectorIcon(
       model_ ? model_->CurrentTextType()
              : AutocompleteMatchType::URL_WHAT_YOU_TYPED);

[Peter Kasting, 2016/07/18 19:31:25]

Make sure this change doesn't change the omnibox icon when on the NTP.

-  // but use a different version for the HTTP icon.
-  return (id == gfx::VectorIconId::OMNIBOX_HTTP)
-             ? gfx::VectorIconId::LOCATION_BAR_HTTP
-             : id;
 #else
   NOTIMPLEMENTED();
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
 void OmniboxView::SetUserText(const base::string16& text) {
   SetUserText(text, true);
 }
 
@@ skipping 102 matching lines @@
   if (client) {
     model_.reset(new OmniboxEditModel(this, controller, std::move(client)));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }