Chromium Code Reviews| Index: components/toolbar/toolbar_model_impl.cc |
| diff --git a/components/toolbar/toolbar_model_impl.cc b/components/toolbar/toolbar_model_impl.cc |
| index f6c7410c5e0209710216d766ff20d1a8a657cad0..599638d836003cc227ee37ef8846b9b2c625458d 100644 |
| --- a/components/toolbar/toolbar_model_impl.cc |
| +++ b/components/toolbar/toolbar_model_impl.cc |
| @@ -35,10 +35,6 @@ ToolbarModelImpl::~ToolbarModelImpl() { |
| // ToolbarModelImpl Implementation. |
| base::string16 ToolbarModelImpl::GetText() const { |
| - base::string16 search_terms(GetSearchTerms(false)); |
| - if (!search_terms.empty()) |
| - return search_terms; |
|
Peter Kasting
2016/08/13 05:03:45
This removal probably means we should rip out GetT
Marc Treib
2016/08/16 12:00:18
Done.
|
| - |
| return GetFormattedURL(NULL); |
| } |
| @@ -70,11 +66,6 @@ GURL ToolbarModelImpl::GetURL() const { |
| return delegate_->GetURL(&url) ? url : GURL(url::kAboutBlankURL); |
| } |
| -bool ToolbarModelImpl::WouldPerformSearchTermReplacement( |
| - bool ignore_editing) const { |
| - return !GetSearchTerms(ignore_editing).empty(); |
| -} |
| - |
| SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel( |
| bool ignore_editing) const { |
| // When editing or empty, assume no security style. |
| @@ -145,10 +136,3 @@ base::string16 ToolbarModelImpl::GetEVCertName() const { |
| bool ToolbarModelImpl::ShouldDisplayURL() const { |
| return delegate_->ShouldDisplayURL(); |
| } |
| - |
| -base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const { |
| - if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing)) |
| - return base::string16(); |
| - |
| - return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing)); |
| -} |