diff options
| author | meacer <meacer@chromium.org> | 2015-11-16 11:36:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-16 19:37:19 +0000 |
| commit | 6fd4bdd7f4c0c5011cbfef026be09158203e112f (patch) | |
| tree | fb7fcdfd571b402d9d82c75a67d40588305ba065 /components/web_modal | |
| parent | 3d0e3360150d8a86778f9cd670349605198e941d (diff) | |
| download | chromium_src-6fd4bdd7f4c0c5011cbfef026be09158203e112f.zip chromium_src-6fd4bdd7f4c0c5011cbfef026be09158203e112f.tar.gz chromium_src-6fd4bdd7f4c0c5011cbfef026be09158203e112f.tar.bz2 | |
Close all WebModal dialogs on Mac when an interstitial is displayed.
BUG=555804
Review URL: https://codereview.chromium.org/1443163006
Cr-Commit-Position: refs/heads/master@{#359891}
Diffstat (limited to 'components/web_modal')
| -rw-r--r-- | components/web_modal/web_contents_modal_dialog_manager.cc | 3 | ||||
| -rw-r--r-- | components/web_modal/web_contents_modal_dialog_manager_unittest.cc | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc index afb2344..46f6af9 100644 --- a/components/web_modal/web_contents_modal_dialog_manager.cc +++ b/components/web_modal/web_contents_modal_dialog_manager.cc @@ -178,10 +178,7 @@ void WebContentsModalDialogManager::WebContentsDestroyed() { } void WebContentsModalDialogManager::DidAttachInterstitialPage() { - // TODO(wittman): Test closing on interstitial webui works properly on Mac. -#if defined(USE_AURA) CloseAllDialogs(); -#endif } } // namespace web_modal diff --git a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc index ea07abf..3afafff 100644 --- a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc +++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc @@ -253,21 +253,11 @@ TEST_F(WebContentsModalDialogManagerTest, InterstitialPage) { test_api->DidAttachInterstitialPage(); -#if defined(USE_AURA) EXPECT_EQ(NativeManagerTracker::CLOSED, tracker1.state_); EXPECT_EQ(NativeManagerTracker::CLOSED, tracker2.state_); -#else - EXPECT_EQ(NativeManagerTracker::SHOWN, tracker1.state_); - EXPECT_EQ(NativeManagerTracker::NOT_SHOWN, tracker2.state_); -#endif EXPECT_TRUE(tracker1.was_shown_); EXPECT_FALSE(tracker2.was_shown_); - -#if !defined(USE_AURA) - native_manager1->StopTracking(); - native_manager2->StopTracking(); -#endif } |