Don't activate tabs showing tab modal dialogs.

BUG=768475,768900,769351 TEST=as in bugs Change-Id: I1fb3244db8883e059e927e84ecca09dd3591f75d Reviewed-on: https://chromium-review.googlesource.com/687811 Reviewed-by: Mike Wittman <[email protected]> Reviewed-by: Scott Violet <[email protected]> Reviewed-by: Sidney San Martín <[email protected]> Commit-Queue: Avi Drissman <[email protected]> Cr-Commit-Position: refs/heads/master@{#512585}
feiyue1206 · Oct 30, 2017 · 7154fd0 · 7154fd0
1 parent 0626323
commit 7154fd0
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 45 deletions.
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -831,50 +831,6 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
   ASSERT_EQ(popup_browser, chrome::FindLastActive());
 }
 
-IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ModalPopUnderViaHTTPAuth) {
-  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
-  GURL url(
-      embedded_test_server()->GetURL("/popup_blocker/popup-window-open.html"));
-  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-      ->SetContentSettingDefaultScope(url, GURL(), CONTENT_SETTINGS_TYPE_POPUPS,
-                                      std::string(), CONTENT_SETTING_ALLOW);
-
-  NavigateAndCheckPopupShown(url, ExpectPopup);
-
-  Browser* popup_browser = chrome::FindLastActive();
-  ASSERT_NE(popup_browser, browser());
-
-  // Showing an http auth dialog will raise the tab over the popup.
-  LoginPromptBrowserTestObserver observer;
-  content::NavigationController* controller = &tab->GetController();
-  observer.Register(content::Source<content::NavigationController>(controller));
-  {
-#if !defined(OS_MACOSX)
-    // Mac doesn't activate the browser during modal dialogs, see
-    // https://crbug.com/687732 for details.
-    ui_test_utils::BrowserActivationWaiter raised_waiter(browser());
-#endif
-    WindowedAuthNeededObserver auth_needed_observer(controller);
-    tab->GetMainFrame()->ExecuteJavaScriptForTests(
-        base::UTF8ToUTF16("var f = document.createElement('iframe'); f.src = "
-                          "'/auth-basic'; document.body.appendChild(f);"));
-    auth_needed_observer.Wait();
-    ASSERT_FALSE(observer.handlers().empty());
-#if !defined(OS_MACOSX)
-    if (chrome::FindLastActive() != browser())
-      raised_waiter.WaitForActivation();
-#endif
-  }
-
-  {
-    ui_test_utils::BrowserActivationWaiter waiter(popup_browser);
-    LoginHandler* handler = *observer.handlers().begin();
-    handler->CancelAuth();
-    waiter.WaitForActivation();
-    ASSERT_EQ(popup_browser, chrome::FindLastActive());
-  }
-}
-
 // Tests that Ctrl+Enter/Cmd+Enter keys on a link open the backgournd tab.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CtrlEnterKey) {
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();

diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h b/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h
@@ -22,6 +22,7 @@ class WebContentsModalDialogHostCocoa
   // web_modal::ModalDialogHost:
   gfx::NativeView GetHostView() const override;
   gfx::Point GetDialogPosition(const gfx::Size& size) override;
+  bool ShouldActivateDialog() const override;
   void AddObserver(web_modal::ModalDialogHostObserver* observer) override;
   void RemoveObserver(web_modal::ModalDialogHostObserver* observer) override;
 

diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.mm b/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.mm
@@ -47,6 +47,10 @@
   return gfx::Point();
 }
 
+bool WebContentsModalDialogHostCocoa::ShouldActivateDialog() const {
+  return [[sheet_controller_ parentWindow] isMainWindow];
+}
+
 void WebContentsModalDialogHostCocoa::AddObserver(
     web_modal::ModalDialogHostObserver* observer) {
   NOTREACHED();

diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -83,6 +83,11 @@ class BrowserViewLayout::WebContentsModalDialogHostViews
     return gfx::Point(middle_x - size.width() / 2, top);
   }
 
+  bool ShouldActivateDialog() const override {
+    views::Widget* widget = browser_view_layout_->browser_view_->GetWidget();
+    return widget->IsActive();
+  }
+
   gfx::Size GetMaximumDialogSize() override {
     views::View* view = browser_view_layout_->contents_container_;
     gfx::Rect content_area = view->ConvertRectToWidget(view->GetLocalBounds());

diff --git a/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc b/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc
@@ -97,7 +97,8 @@ void NativeWebContentsModalDialogManagerViews::Show() {
   }
 #endif
   ShowWidget(widget);
-  Focus();
+  if (host_->ShouldActivateDialog())
+    Focus();
 
 #if defined(USE_AURA)
   // TODO(pkotwicz): Control the z-order of the constrained dialog via

diff --git a/components/web_modal/modal_dialog_host.cc b/components/web_modal/modal_dialog_host.cc
@@ -12,4 +12,8 @@ ModalDialogHostObserver::~ModalDialogHostObserver() {
 ModalDialogHost::~ModalDialogHost() {
 }
 
+bool ModalDialogHost::ShouldActivateDialog() const {
+  return true;
+}
+
 }  // namespace web_modal
diff --git a/components/web_modal/modal_dialog_host.h b/components/web_modal/modal_dialog_host.h
@@ -33,6 +33,8 @@ class ModalDialogHost {
   virtual gfx::NativeView GetHostView() const = 0;
   // Gets the position for the dialog in coordinates relative to the host view.
   virtual gfx::Point GetDialogPosition(const gfx::Size& size) = 0;
+  // Returns whether a dialog currently about to be shown should be activated.
+  virtual bool ShouldActivateDialog() const;
 
   // Add/remove observer.
   virtual void AddObserver(ModalDialogHostObserver* observer) = 0;