| Index: components/omnibox/browser/omnibox_view.cc
|
| diff --git a/components/omnibox/browser/omnibox_view.cc b/components/omnibox/browser/omnibox_view.cc
|
| index a09b95436e3f1311519e50db03b7bdf84862e8d4..d471fb120c2192eecd663ff6b495518e85dfa034 100644
|
| --- a/components/omnibox/browser/omnibox_view.cc
|
| +++ b/components/omnibox/browser/omnibox_view.cc
|
| @@ -79,13 +79,26 @@
|
| (GetOmniboxTextLength() == 0);
|
| }
|
|
|
| +int OmniboxView::GetIcon() const {
|
| + if (!IsEditingOrEmpty())
|
| + return controller_->GetToolbarModel()->GetIcon();
|
| + 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();
|
|
|
| return AutocompleteMatch::TypeToVectorIcon(
|
| model_ ? model_->CurrentTextType()
|
| : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
|
| +#else
|
| + NOTIMPLEMENTED();
|
| + return gfx::VectorIconId::VECTOR_ICON_NONE;
|
| +#endif
|
| }
|
|
|
| void OmniboxView::SetUserText(const base::string16& text) {
|
|
|