Fix double zoom bubble on Mac full screen

On Mac, the toolbar can be shown or hidden on full screen. The zoom
bubble changes its anchor position when the toolbar visibility
changes. We can not simply refresh the shown Zoom bubble if its anchor
position changed. So we need to allow Zoom bubble to be closed in that
case. Otherwise, double zoom bubbles may be shown as described in the
bug.

BUG=1072353

Change-Id: I5abc492e81b0e207556d528de3635e85f6bce9d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159315Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Wei Li <weili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761972}

chrome/browser/ui/views/location_bar/zoom_bubble_view.cc

@@ -442,8 +442,11 @@ void ZoomBubbleView::WindowClosing() {
 }
 
 void ZoomBubbleView::CloseBubble() {
-  if (ignore_close_bubble_)
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
+  if (ignore_close_bubble_ &&
+      GetAnchorViewForBrowser(browser) == GetAnchorView()) {
     return;
+  }
 
   // Widget's Close() is async, but we don't want to use zoom_bubble_ after
   // this. Additionally web_contents() may have been destroyed.

chrome/browser/ui/views/location_bar/zoom_bubble_view.h

@@ -57,6 +57,7 @@ class ZoomBubbleView : public LocationBarBubbleDelegateView,
   FRIEND_TEST_ALL_PREFIXES(ZoomBubbleBrowserTest,
                            BubbleSuppressingExtensionRefreshesExistingBubble);
   FRIEND_TEST_ALL_PREFIXES(ZoomBubbleBrowserTest, FocusPreventsClose);
+  FRIEND_TEST_ALL_PREFIXES(ZoomBubbleBrowserTest, AnchorPositionsInFullscreen);
 
   // Returns true if we can reuse the existing bubble for the given
   // |web_contents|.

chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc

@@ -17,7 +17,9 @@
 #include "components/zoom/zoom_controller.h"
 #include "extensions/browser/extension_zoom_request_client.h"
 #include "extensions/common/extension_builder.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/views/test/test_widget_observer.h"
+#include "ui/views/test/widget_test.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/public/cpp/immersive/immersive_fullscreen_controller_test_api.h"
@@ -25,6 +27,7 @@
 #endif
 
 #if defined(OS_MACOSX)
+#include "chrome/browser/ui/browser_commands_mac.h"
 #include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
 #endif
 
@@ -87,6 +90,83 @@ IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, NonImmersiveFullscreen) {
   }
 }
 
+// Test whether the zoom bubble is anchored to the same location if the toolbar
+// shows in fullscreen. And when the toolbar hides in fullscreen, the zoom
+// bubble should close and re-show in a new un-anchored position.
+IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, AnchorPositionsInFullscreen) {
+#if defined(OS_MACOSX)
+  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
+#endif
+
+  BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
+  content::WebContents* web_contents = browser_view->GetActiveWebContents();
+
+  ZoomBubbleView::ShowBubble(web_contents, ZoomBubbleView::AUTOMATIC);
+  ASSERT_TRUE(ZoomBubbleView::GetZoomBubble());
+  ZoomBubbleView* zoom_bubble = ZoomBubbleView::GetZoomBubble();
+  ASSERT_TRUE(zoom_bubble);
+  // Record the anchor view when not in fullscreen.
+  const views::View* org_anchor_view = zoom_bubble->GetAnchorView();
+
+  // Enter into a browser fullscreen mode. This would close the zoom bubble.
+  {
+    // The fullscreen change notification is sent asynchronously. Wait for the
+    // notification before testing the zoom bubble visibility.
+    FullscreenNotificationObserver waiter(browser());
+    chrome::ToggleFullscreenMode(browser());
+    waiter.Wait();
+  }
+  EXPECT_FALSE(ZoomBubbleView::GetZoomBubble());
+
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+  const bool should_show_toolbar = true;
+#else
+  const bool should_show_toolbar = false;
+#endif
+  EXPECT_EQ(should_show_toolbar, browser()->window()->IsToolbarVisible());
+
+  // The zoom bubble should be anchored to the same anchor view if the toolbar
+  // shows.
+  ZoomBubbleView::ShowBubble(web_contents, ZoomBubbleView::AUTOMATIC);
+  zoom_bubble = ZoomBubbleView::GetZoomBubble();
+  ASSERT_TRUE(zoom_bubble);
+  if (should_show_toolbar) {
+    EXPECT_EQ(org_anchor_view, zoom_bubble->GetAnchorView());
+#if defined(OS_MACOSX)
+    const ZoomBubbleView* org_zoom_bubble = zoom_bubble;
+    // Hide toolbar.
+    chrome::ToggleFullscreenToolbar(browser());
+
+    zoom_bubble = ZoomBubbleView::GetZoomBubble();
+    EXPECT_EQ(org_zoom_bubble, zoom_bubble);
+    EXPECT_EQ(org_anchor_view, zoom_bubble->GetAnchorView());
+
+    views::test::WidgetDestroyedWaiter waiter(zoom_bubble->GetWidget());
+    // Press the zoom-in button. This will open a new bubble in an un-anchored
+    // position.
+    const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
+                               ui::EventTimeForNow(), 0, 0);
+    zoom_bubble->ButtonPressed(zoom_bubble->zoom_in_button_, event);
+    zoom_bubble = ZoomBubbleView::GetZoomBubble();
+    EXPECT_NE(org_zoom_bubble, zoom_bubble);
+    EXPECT_FALSE(zoom_bubble->GetAnchorView());
+
+    // Closing the original zoom bubble is asynchronous.
+    waiter.Wait();
+    EXPECT_TRUE(zoom_bubble->GetWidget());
+#endif
+  } else {
+    EXPECT_FALSE(zoom_bubble->GetAnchorView());
+  }
+
+  // Don't leave the browser in fullscreen for subsequent tests.
+  {
+    FullscreenNotificationObserver waiter(browser());
+    chrome::ToggleFullscreenMode(browser());
+    waiter.Wait();
+  }
+}
+
 #if defined(OS_CHROMEOS)
 // Test whether the zoom bubble is anchored and whether it is visible when in
 // immersive fullscreen.