diff options
| -rw-r--r-- | chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm index 3880b11..7273bb0 100644 --- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm @@ -97,7 +97,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) { trackingArea_.reset([[CrTrackingArea alloc] initWithRect:NSZeroRect options:NSTrackingMouseEnteredAndExited | - NSTrackingActiveInKeyWindow | + NSTrackingActiveAlways | NSTrackingInVisibleRect owner:self userInfo:nil]); diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm index d6a3fd2..469feae 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm @@ -70,8 +70,10 @@ void ZoomDecoration::ShowBubble(BOOL auto_close) { // If the page is at default zoom then hiding the zoom decoration was // suppressed while the bubble was open. Now that the bubble is closed // the decoration can be hidden. - if (IsAtDefaultZoom()) + if (IsAtDefaultZoom() && IsVisible()) { SetVisible(false); + owner_->OnDecorationsChanged(); + } }; bubble_ = [[ZoomBubbleController alloc] initWithParentWindow:[field window] |