Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2966)

Unified Diff: chrome/browser/ui/toolbar/toolbar_model_impl.cc

Issue 749693005: Remove SearchButton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-origin-2
Patch Set: Merge to HEAD Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index aca7450bd72e0d9c30a5c3d0765256675c98d459..08b863da0e772348ef305c7e6de44c9d6ce5ae46 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -257,13 +257,8 @@ ToolbarModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
}
int ToolbarModelImpl::GetIcon() const {
- if (WouldPerformSearchTermReplacement(false)) {
- // The secured version of the search icon is necessary if the search button
- // is not present to indicate the security state.
- return (chrome::GetDisplaySearchButtonConditions() ==
- chrome::DISPLAY_SEARCH_BUTTON_NEVER) ?
- IDR_OMNIBOX_SEARCH_SECURED : IDR_OMNIBOX_SEARCH;
- }
+ if (WouldPerformSearchTermReplacement(false))
+ return IDR_OMNIBOX_SEARCH_SECURED;
return GetIconForSecurityLevel(GetSecurityLevel(false));
}

Powered by Google App Engine
This is Rietveld 408576698