| 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..e7d693e698e5c3e1c43eb599d4fab8161e6d4de8 100644
|
| --- a/components/toolbar/toolbar_model_impl.cc
|
| +++ b/components/toolbar/toolbar_model_impl.cc
|
| @@ -34,14 +34,6 @@ ToolbarModelImpl::~ToolbarModelImpl() {
|
| }
|
|
|
| // ToolbarModelImpl Implementation.
|
| -base::string16 ToolbarModelImpl::GetText() const {
|
| - base::string16 search_terms(GetSearchTerms(false));
|
| - if (!search_terms.empty())
|
| - return search_terms;
|
| -
|
| - return GetFormattedURL(NULL);
|
| -}
|
| -
|
| base::string16 ToolbarModelImpl::GetFormattedURL(size_t* prefix_end) const {
|
| GURL url(GetURL());
|
| // Note that we can't unescape spaces here, because if the user copies this
|
| @@ -70,11 +62,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 +132,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));
|
| -}
|
|
|