| Index: chrome/browser/ui/toolbar/toolbar_model.cc
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc
|
| index 8dc3acb14f4db2bbf58681948bf407fe47b838ac..1c0a17ba7029d719f48a7cee18d68b63430d1551 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_model.cc
|
| +++ b/chrome/browser/ui/toolbar/toolbar_model.cc
|
| @@ -8,7 +8,6 @@
|
|
|
| ToolbarModel::ToolbarModel()
|
| : input_in_progress_(false),
|
| - origin_chip_enabled_(true),
|
| url_replacement_enabled_(true) {
|
| }
|
|
|
| @@ -16,11 +15,6 @@ ToolbarModel::~ToolbarModel() {
|
| }
|
|
|
| bool ToolbarModel::WouldReplaceURL() const {
|
| - return WouldOmitURLDueToOriginChip() ||
|
| - WouldPerformSearchTermReplacement(false);
|
| + return WouldPerformSearchTermReplacement(false);
|
| }
|
|
|
| -bool ToolbarModel::ShouldShowOriginChip() const {
|
| - return chrome::ShouldDisplayOriginChip() && WouldOmitURLDueToOriginChip() &&
|
| - origin_chip_enabled();
|
| -}
|
|
|