Chromium Code Reviews| Index: components/omnibox/browser/omnibox_view.cc |
| diff --git a/components/omnibox/browser/omnibox_view.cc b/components/omnibox/browser/omnibox_view.cc |
| index 040058110f8b306908d97da35b543b67dc424af1..a21ba1a26947ae4cfc4e50df3acc97c00ac4aef0 100644 |
| --- a/components/omnibox/browser/omnibox_view.cc |
| +++ b/components/omnibox/browser/omnibox_view.cc |
| @@ -86,23 +86,17 @@ int OmniboxView::GetIcon() const { |
| return (id == IDR_OMNIBOX_HTTP) ? IDR_LOCATION_BAR_HTTP : id; |
| } |
| -gfx::VectorIconId OmniboxView::GetVectorIcon(bool invert) const { |
| +gfx::VectorIconId OmniboxView::GetVectorIcon() const { |
| #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| if (!IsEditingOrEmpty()) { |
| gfx::VectorIconId id = controller_->GetToolbarModel()->GetVectorIcon(); |
|
Evan Stade
2016/05/18 21:40:42
nit: don't need this local var any more
palmer
2016/05/19 17:49:23
Done.
|
| - if (invert) { |
| - if (id == gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID) |
| - return gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_INVERT; |
| - if (id == gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID) |
| - return gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID_INVERT; |
| - } |
| return id; |
| } |
| // Reuse the dropdown icons... |
| gfx::VectorIconId id = AutocompleteMatch::TypeToVectorIcon( |
| model_ ? model_->CurrentTextType() |
| : AutocompleteMatchType::URL_WHAT_YOU_TYPED); |
| - // but use a tweaked version for the HTTP icon. |
| + // but use a different version for the HTTP icon. |
| return (id == gfx::VectorIconId::OMNIBOX_HTTP) |
| ? gfx::VectorIconId::LOCATION_BAR_HTTP |
| : id; |