diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/web_modal | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/web_modal')
3 files changed, 0 insertions, 30 deletions
diff --git a/chromium/components/web_modal/web_contents_modal_dialog_manager.cc b/chromium/components/web_modal/web_contents_modal_dialog_manager.cc index 209e09c499e..f9ec11d0a01 100644 --- a/chromium/components/web_modal/web_contents_modal_dialog_manager.cc +++ b/chromium/components/web_modal/web_contents_modal_dialog_manager.cc @@ -170,10 +170,6 @@ void WebContentsModalDialogManager::WebContentsDestroyed() { CloseAllDialogs(); } -void WebContentsModalDialogManager::DidAttachInterstitialPage() { - CloseAllDialogs(); -} - WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsModalDialogManager) } // namespace web_modal diff --git a/chromium/components/web_modal/web_contents_modal_dialog_manager.h b/chromium/components/web_modal/web_contents_modal_dialog_manager.h index d843a7fa5da..75002befdc2 100644 --- a/chromium/components/web_modal/web_contents_modal_dialog_manager.h +++ b/chromium/components/web_modal/web_contents_modal_dialog_manager.h @@ -55,7 +55,6 @@ class WEB_MODAL_EXPORT WebContentsModalDialogManager : manager_(manager) {} void CloseAllDialogs() { manager_->CloseAllDialogs(); } - void DidAttachInterstitialPage() { manager_->DidAttachInterstitialPage(); } void WebContentsVisibilityChanged(content::Visibility visibility) { manager_->OnVisibilityChanged(visibility); } @@ -94,7 +93,6 @@ class WEB_MODAL_EXPORT WebContentsModalDialogManager void DidGetIgnoredUIEvent() override; void OnVisibilityChanged(content::Visibility visibility) override; void WebContentsDestroyed() override; - void DidAttachInterstitialPage() override; // Delegate for notifying our owner about stuff. Not owned by us. WebContentsModalDialogManagerDelegate* delegate_; diff --git a/chromium/components/web_modal/web_contents_modal_dialog_manager_unittest.cc b/chromium/components/web_modal/web_contents_modal_dialog_manager_unittest.cc index 7d1ce9562fc..681f8b2ea0b 100644 --- a/chromium/components/web_modal/web_contents_modal_dialog_manager_unittest.cc +++ b/chromium/components/web_modal/web_contents_modal_dialog_manager_unittest.cc @@ -221,30 +221,6 @@ TEST_F(WebContentsModalDialogManagerTest, VisibilityObservation) { native_manager->StopTracking(); } -// Test that attaching an interstitial page closes all dialogs. -TEST_F(WebContentsModalDialogManagerTest, InterstitialPage) { - const gfx::NativeWindow dialog1 = MakeFakeDialog(); - const gfx::NativeWindow dialog2 = MakeFakeDialog(); - - NativeManagerTracker tracker1; - NativeManagerTracker tracker2; - TestNativeWebContentsModalDialogManager* native_manager1 = - new TestNativeWebContentsModalDialogManager(dialog1, manager, &tracker1); - TestNativeWebContentsModalDialogManager* native_manager2 = - new TestNativeWebContentsModalDialogManager(dialog2, manager, &tracker2); - manager->ShowDialogWithManager(dialog1, base::WrapUnique(native_manager1)); - manager->ShowDialogWithManager(dialog2, base::WrapUnique(native_manager2)); - - test_api->DidAttachInterstitialPage(); - - EXPECT_EQ(NativeManagerTracker::CLOSED, tracker1.state_); - EXPECT_EQ(NativeManagerTracker::CLOSED, tracker2.state_); - - EXPECT_TRUE(tracker1.was_shown_); - EXPECT_FALSE(tracker2.was_shown_); -} - - // Test that the first dialog is always shown, regardless of the order in which // dialogs are closed. TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) { |