| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| index edd90f6650e8bc8f907d35c34fac84bc7cf8fee0..a1e118eff5bc160b4507fe13a0ee3319fbebe3aa 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| @@ -163,7 +163,8 @@ LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
|
| !browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)];
|
|
|
| if (chrome::ShouldDisplayOriginChipV2())
|
| - origin_chip_decoration_.reset(new OriginChipDecoration(this));
|
| + origin_chip_decoration_.reset(new OriginChipDecoration(
|
| + this, location_icon_decoration_.get()));
|
| }
|
|
|
| LocationBarViewMac::~LocationBarViewMac() {
|
| @@ -304,7 +305,7 @@ ExtensionAction* LocationBarViewMac::GetVisiblePageAction(size_t index) {
|
| void LocationBarViewMac::TestPageActionPressed(size_t index) {
|
| DCHECK_LT(index, page_action_decorations_.size());
|
| if (index < page_action_decorations_.size())
|
| - page_action_decorations_[index]->OnMousePressed(NSZeroRect);
|
| + page_action_decorations_[index]->OnMousePressed(NSZeroRect, NSZeroPoint);
|
| }
|
|
|
| bool LocationBarViewMac::GetBookmarkStarVisibility() {
|
| @@ -361,7 +362,9 @@ NSPoint LocationBarViewMac::GetTranslateBubblePoint() const {
|
| }
|
|
|
| NSPoint LocationBarViewMac::GetPageInfoBubblePoint() const {
|
| - if (ev_bubble_decoration_->IsVisible()) {
|
| + if (origin_chip_decoration_ && origin_chip_decoration_->IsVisible()) {
|
| + return [field_ bubblePointForDecoration:origin_chip_decoration_.get()];
|
| + } else if (ev_bubble_decoration_->IsVisible()) {
|
| return [field_ bubblePointForDecoration:ev_bubble_decoration_.get()];
|
| } else {
|
| return [field_ bubblePointForDecoration:location_icon_decoration_.get()];
|
|
|