Move around more vector icons.

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 61 matching lines @@
       match, disposition, alternate_nav_url, pasted_text, selected_line);
   // WARNING: |match| may refer to a deleted object at this point!
   OnMatchOpened(match_type);
 }
 
 bool OmniboxView::IsEditingOrEmpty() const {
   return (model_.get() && model_->user_input_in_progress()) ||
       (GetOmniboxTextLength() == 0);
 }
 
-gfx::VectorIconId OmniboxView::GetVectorIcon() const {
+const gfx::VectorIcon& OmniboxView::GetVectorIcon() const {
   if (!IsEditingOrEmpty())
     return controller_->GetToolbarModel()->GetVectorIcon();
 
   return AutocompleteMatch::TypeToVectorIcon(
       model_ ? model_->CurrentTextType()
              : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
 }
 
 void OmniboxView::SetUserText(const base::string16& text) {
   SetUserText(text, true);
@@ skipping 85 matching lines @@
   if (client) {
     model_.reset(new OmniboxEditModel(this, controller, std::move(client)));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }