Chromium Code Reviews| Index: chrome/browser/ui/views/location_bar/origin_chip_view.cc |
| diff --git a/chrome/browser/ui/views/location_bar/origin_chip_view.cc b/chrome/browser/ui/views/location_bar/origin_chip_view.cc |
| index dd6c82f563fe7b1b9bd76851cb3b870dfce3c9a5..c8fd54241c537c8557b6d88de5af53f01a9783e0 100644 |
| --- a/chrome/browser/ui/views/location_bar/origin_chip_view.cc |
| +++ b/chrome/browser/ui/views/location_bar/origin_chip_view.cc |
| @@ -170,9 +170,7 @@ OriginChipView::~OriginChipView() { |
| } |
| bool OriginChipView::ShouldShow() { |
| - return chrome::ShouldDisplayOriginChipV2() && |
| - location_bar_view_->GetToolbarModel()->WouldOmitURLDueToOriginChip() && |
| - location_bar_view_->GetToolbarModel()->origin_chip_enabled(); |
| + return location_bar_view_->GetToolbarModel()->ShouldShowOriginChip(); |
|
Peter Kasting
2014/05/05 22:39:04
Let's eliminate ShouldShow() entirely and have cal
macourteau
2014/05/08 21:35:55
Done.
|
| } |
| void OriginChipView::Update(content::WebContents* web_contents) { |