Chromium Code Reviews| Index: components/toolbar/toolbar_model.h |
| diff --git a/components/toolbar/toolbar_model.h b/components/toolbar/toolbar_model.h |
| index afc86a9c1e9bfb238d4c9a872165b337b5401664..88805fc21acda5b678a351af960a64d752c45d89 100644 |
| --- a/components/toolbar/toolbar_model.h |
| +++ b/components/toolbar/toolbar_model.h |
| @@ -18,10 +18,6 @@ namespace gfx { |
| enum class VectorIconId; |
| } |
| -namespace net { |
| -class X509Certificate; |
| -} |
| - |
| // This class is the model used by the toolbar, location bar and autocomplete |
| // edit. It populates its states from the current navigation entry retrieved |
| // from the navigation controller returned by GetNavigationController(). |
| @@ -48,12 +44,6 @@ class ToolbarModel { |
| // Returns the URL of the current navigation entry. |
| virtual GURL GetURL() const = 0; |
| - // Returns true if a call to GetText() would successfully replace the URL |
| - // with search terms. If |ignore_editing| is true, the result reflects the |
| - // underlying state of the page without regard to any user edits that may be |
| - // in progress in the omnibox. |
| - virtual bool WouldPerformSearchTermReplacement(bool ignore_editing) const = 0; |
| - |
| // Returns the security level that the toolbar should display. If |
| // |ignore_editing| is true, the result reflects the underlying state of the |
| // page without regard to any user edits that may be in progress in the |
| @@ -61,10 +51,6 @@ class ToolbarModel { |
| virtual security_state::SecurityStateModel::SecurityLevel GetSecurityLevel( |
| bool ignore_editing) const = 0; |
| - // Returns true if a call to GetText() would return something other than the |
| - // URL because of search term replacement. |
| - bool WouldReplaceURL() const; |
| - |
| // Returns the resource_id of the icon to show to the left of the address, |
| // based on the current URL. When search term replacement is active, this |
| // returns a search icon. This doesn't cover specialized icons while the |
| @@ -89,6 +75,7 @@ class ToolbarModel { |
| bool input_in_progress() const { return input_in_progress_; } |
| // Whether URL replacement should be enabled. |
| + // TODO(treib,pkasting): Can this be removed? crbug.com/627747 |
|
Peter Kasting
2016/08/13 05:03:44
Yes, it can.
Marc Treib
2016/08/16 12:00:18
Thanks! I left a TODO for now, since removing it i
|
| void set_url_replacement_enabled(bool enabled) { |
| url_replacement_enabled_ = enabled; |
| } |