Rename components/app_modal to components/javascript_dialogs
The code in this component is unique to javascript dialogs, and does
not cover all app modals. Further, it has some view code that isn't
specifically for app modal javascript dialogs, but is re-used for tab
modals. Some tab modal code from //chrome will be moved here soon, so
rename from app_modal to javascript_dialogs. Class names reflect whether
their use is specific to the app modal control flow.
Also, rename some classes to better reflect their roles:
. JavaScriptDialogManager (implements content::JavaScriptDialogManager)
=> AppModalDialogManager
. JavaScriptAppModalDialog => AppModalDialogController
. NativeAppModalDialog => AppModalDialogView
etc.
Bug: 1025256
Change-Id: I0a1865ec71897ae6549184bc317ede29cc56438a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031936
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Commit-Queue: Evan Stade <[email protected]>
Cr-Commit-Position: refs/heads/master@{#737355}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index e43fbb1..c7d2d78 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1992,7 +1992,6 @@
"//chrome/common/net",
"//chrome/installer/util:with_no_strings",
"//chrome/services/local_search_service:local_search_service",
- "//components/app_modal",
"//components/assist_ranker",
"//components/autofill/content/browser",
"//components/autofill/core/browser",
@@ -2048,6 +2047,7 @@
"//components/history/core/common",
"//components/infobars/core",
"//components/invalidation/impl",
+ "//components/javascript_dialogs",
"//components/keyed_service/content",
"//components/language/content/browser",
"//components/language/core/browser",
@@ -2967,7 +2967,6 @@
"//chrome/browser/share",
"//chrome/browser/updates",
"//chrome/services/media_gallery_util/public/cpp",
- "//components/app_modal/android:jni_headers",
"//components/autofill_assistant/browser",
"//components/cdm/browser",
"//components/content_capture/android",
@@ -2976,6 +2975,7 @@
"//components/feed:buildflags",
"//components/feed:feature_list",
"//components/invalidation/impl:feature_list",
+ "//components/javascript_dialogs/android:jni_headers",
"//components/language/android:language_bridge",
"//components/module_installer/android:native",
"//components/omnibox/browser",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 42ad8f4..afa2773 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -27,7 +27,6 @@
"+chromeos",
"+components/about_ui",
"+components/account_id",
- "+components/app_modal",
"+components/arc",
"+components/assist_ranker",
"+components/autofill_assistant/browser",
@@ -122,6 +121,7 @@
"+components/infobars/core",
"+components/invalidation/impl",
"+components/invalidation/public",
+ "+components/javascript_dialogs",
"+components/keep_alive_registry",
"+components/keyed_service/content",
"+components/keyed_service/core",
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
index 9739472..6c977da4 100644
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -51,10 +51,10 @@
#include "chrome/browser/vr/vr_tab_helper.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
-#include "components/app_modal/javascript_dialog_manager.h"
#include "components/find_in_page/find_notification_details.h"
#include "components/find_in_page/find_tab_helper.h"
#include "components/infobars/core/infobar.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "components/navigation_interception/intercept_navigation_delegate.h"
#include "components/security_state/content/content_utils.h"
#include "content/public/browser/file_select_listener.h"
@@ -283,7 +283,7 @@
if (!vr::VrTabHelper::IsInVr(source)) {
return JavaScriptDialogTabHelper::FromWebContents(source);
}
- return app_modal::JavaScriptDialogManager::GetInstance();
+ return javascript_dialogs::AppModalDialogManager::GetInstance();
}
void TabWebContentsDelegateAndroid::AdjustPreviewsStateForNavigation(
diff --git a/chrome/browser/autofill/captured_sites_test_utils.cc b/chrome/browser/autofill/captured_sites_test_utils.cc
index 33cdc02..c4ca5723 100644
--- a/chrome/browser/autofill/captured_sites_test_utils.cc
+++ b/chrome/browser/autofill/captured_sites_test_utils.cc
@@ -28,8 +28,8 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "content/public/browser/browsing_data_remover.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_process_host.h"
@@ -1764,9 +1764,9 @@
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
- app_modal::JavaScriptAppModalDialog* alert =
+ javascript_dialogs::AppModalDialogController* alert =
ui_test_utils::WaitForAppModalDialog();
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
}
bool TestRecipeReplayer::HasChromeStoredCredential(
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 6ff85ae0..0a557ec1 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -103,7 +103,7 @@
#include "chrome/browser/tracing/navigation_tracing.h"
#include "chrome/browser/tracing/trace_event_system_stats_monitor.h"
#include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h"
+#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h"
#include "chrome/browser/ui/profile_error_dialog.h"
#include "chrome/browser/ui/startup/bad_flags_prompt.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
@@ -1221,7 +1221,7 @@
javascript_dialog_extensions_client::InstallClient();
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- InstallChromeJavaScriptNativeAppModalDialogFactory();
+ InstallChromeJavaScriptAppModalDialogViewFactory();
}
void ChromeBrowserMainParts::PostProfileInit() {
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 2d18880..71efad9 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -53,14 +53,14 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/autofill/content/browser/content_autofill_driver.h"
#include "components/autofill/content/browser/content_autofill_driver_factory.h"
#include "components/autofill/core/browser/autofill_experiments.h"
#include "components/autofill/core/browser/autofill_manager.h"
#include "components/autofill/core/browser/autofill_manager_test_delegate.h"
#include "components/autofill/core/common/autofill_features.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "components/policy/core/common/mock_configuration_policy_provider.h"
#include "components/policy/core/common/policy_map.h"
#include "components/policy/policy_constants.h"
@@ -109,8 +109,6 @@
#include "chromeos/constants/chromeos_switches.h"
#endif
-using app_modal::JavaScriptAppModalDialog;
-using app_modal::NativeAppModalDialog;
using content::BrowserThread;
using content::DevToolsAgentHost;
using content::DevToolsAgentHostObserver;
@@ -118,6 +116,7 @@
using content::RenderFrameHost;
using content::WebContents;
using extensions::Extension;
+using javascript_dialogs::AppModalDialogView;
namespace {
@@ -394,20 +393,21 @@
}
void AcceptModalDialog() {
- NativeAppModalDialog* native_dialog = GetDialog();
- native_dialog->AcceptAppModalDialog();
+ AppModalDialogView* view = GetDialog();
+ view->AcceptAppModalDialog();
}
void CancelModalDialog() {
- NativeAppModalDialog* native_dialog = GetDialog();
- native_dialog->CancelAppModalDialog();
+ AppModalDialogView* view = GetDialog();
+ view->CancelAppModalDialog();
}
- NativeAppModalDialog* GetDialog() {
- JavaScriptAppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
- NativeAppModalDialog* native_dialog = dialog->native_dialog();
- EXPECT_TRUE(native_dialog);
- return native_dialog;
+ AppModalDialogView* GetDialog() {
+ javascript_dialogs::AppModalDialogController* dialog =
+ ui_test_utils::WaitForAppModalDialog();
+ AppModalDialogView* view = dialog->view();
+ EXPECT_TRUE(view);
+ return view;
}
};
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 7e8ec50..deea6c4 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -36,7 +36,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "components/performance_manager/embedder/performance_manager_registry.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/scoped_user_pref_update.h"
@@ -1276,7 +1276,7 @@
content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager(
WebContents* source) {
- return app_modal::JavaScriptDialogManager::GetInstance();
+ return javascript_dialogs::AppModalDialogManager::GetInstance();
}
content::ColorChooser* DevToolsWindow::OpenColorChooser(
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 8aea6b52..28658f6 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -800,7 +800,6 @@
"//chrome/common/extensions/api:extensions_features",
"//chrome/common/safe_browsing:proto",
"//chrome/services/removable_storage_writer/public/mojom",
- "//components/app_modal",
"//components/autofill/content/browser",
"//components/bookmarks/browser",
"//components/bookmarks/managed",
@@ -822,6 +821,7 @@
"//components/guest_view/browser",
"//components/history/core/browser",
"//components/infobars/core",
+ "//components/javascript_dialogs",
"//components/keyed_service/content",
"//components/language/core/browser",
"//components/language/core/common",
diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc
index 9bf9b56..7e38da1 100644
--- a/chrome/browser/extensions/alert_apitest.cc
+++ b/chrome/browser/extensions/alert_apitest.cc
@@ -12,9 +12,9 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/app_modal_dialog_queue.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_queue.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/extension_host.h"
@@ -25,29 +25,29 @@
namespace {
-void GetNextDialog(app_modal::NativeAppModalDialog** native_dialog) {
- DCHECK(native_dialog);
- *native_dialog = nullptr;
- app_modal::JavaScriptAppModalDialog* dialog =
+void GetNextDialog(javascript_dialogs::AppModalDialogView** view) {
+ DCHECK(view);
+ *view = nullptr;
+ javascript_dialogs::AppModalDialogController* dialog =
ui_test_utils::WaitForAppModalDialog();
- *native_dialog = dialog->native_dialog();
- ASSERT_TRUE(*native_dialog);
+ *view = dialog->view();
+ ASSERT_TRUE(*view);
}
void CloseDialog() {
- app_modal::NativeAppModalDialog* dialog = nullptr;
+ javascript_dialogs::AppModalDialogView* dialog = nullptr;
ASSERT_NO_FATAL_FAILURE(GetNextDialog(&dialog));
dialog->CloseAppModalDialog();
}
void AcceptDialog() {
- app_modal::NativeAppModalDialog* dialog = nullptr;
+ javascript_dialogs::AppModalDialogView* dialog = nullptr;
ASSERT_NO_FATAL_FAILURE(GetNextDialog(&dialog));
dialog->AcceptAppModalDialog();
}
void CancelDialog() {
- app_modal::NativeAppModalDialog* dialog = nullptr;
+ javascript_dialogs::AppModalDialogView* dialog = nullptr;
ASSERT_NO_FATAL_FAILURE(GetNextDialog(&dialog));
dialog->CancelAppModalDialog();
}
@@ -109,8 +109,8 @@
}
// All dialogs must be closed now.
- app_modal::AppModalDialogQueue* queue =
- app_modal::AppModalDialogQueue::GetInstance();
+ javascript_dialogs::AppModalDialogQueue* queue =
+ javascript_dialogs::AppModalDialogQueue::GetInstance();
ASSERT_TRUE(queue);
EXPECT_FALSE(queue->HasActiveDialog());
EXPECT_EQ(0, queue->end() - queue->begin());
@@ -154,8 +154,8 @@
ASSERT_NO_FATAL_FAILURE(CancelDialog());
// All dialogs must be closed now.
- app_modal::AppModalDialogQueue* queue =
- app_modal::AppModalDialogQueue::GetInstance();
+ javascript_dialogs::AppModalDialogQueue* queue =
+ javascript_dialogs::AppModalDialogQueue::GetInstance();
ASSERT_TRUE(queue);
EXPECT_FALSE(queue->HasActiveDialog());
EXPECT_EQ(0, queue->end() - queue->begin());
diff --git a/chrome/browser/extensions/chrome_extension_host_delegate.cc b/chrome/browser/extensions/chrome_extension_host_delegate.cc
index 54852f6..ad21bc1 100644
--- a/chrome/browser/extensions/chrome_extension_host_delegate.cc
+++ b/chrome/browser/extensions/chrome_extension_host_delegate.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
#include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
-#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "components/performance_manager/embedder/performance_manager_registry.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_system.h"
@@ -48,7 +48,7 @@
content::JavaScriptDialogManager*
ChromeExtensionHostDelegate::GetJavaScriptDialogManager() {
- return app_modal::JavaScriptDialogManager::GetInstance();
+ return javascript_dialogs::AppModalDialogManager::GetInstance();
}
void ChromeExtensionHostDelegate::CreateTab(
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 191173a..201549a 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -28,10 +28,10 @@
#include "chrome/common/extensions/api/tabs.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_utils.h"
#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
#include "components/nacl/common/buildflags.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
@@ -243,7 +243,7 @@
ASSERT_TRUE(extension);
// The test extension opens a dialog on installation.
- app_modal::JavaScriptAppModalDialog* dialog =
+ javascript_dialogs::AppModalDialogController* dialog =
ui_test_utils::WaitForAppModalDialog();
ASSERT_TRUE(dialog);
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc
index 72f41a1..12995294 100644
--- a/chrome/browser/extensions/process_manager_browsertest.cc
+++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -28,8 +28,8 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_dialog_manager.h"
#include "components/guest_view/browser/test_guest_view_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
@@ -1751,8 +1751,8 @@
EXPECT_EQ(hosted_app_url, tab->GetLastCommittedURL());
ProcessManager* pm = ProcessManager::Get(profile());
EXPECT_EQ(extension, pm->GetExtensionForWebContents(tab));
- app_modal::JavaScriptDialogManager* js_dialog_manager =
- app_modal::JavaScriptDialogManager::GetInstance();
+ javascript_dialogs::AppModalDialogManager* js_dialog_manager =
+ javascript_dialogs::AppModalDialogManager::GetInstance();
base::string16 hosted_app_title = base::ASCIIToUTF16("hosted_app");
EXPECT_EQ(hosted_app_title, js_dialog_manager->GetTitle(
tab, tab->GetLastCommittedURL().GetOrigin()));
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 5b33e8a..227e91384 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -39,9 +39,9 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/download/public/common/download_item.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
#include "components/sessions/core/tab_restore_service.h"
@@ -66,11 +66,11 @@
namespace {
-app_modal::NativeAppModalDialog* GetNextDialog() {
- app_modal::JavaScriptAppModalDialog* dialog =
+javascript_dialogs::AppModalDialogView* GetNextDialog() {
+ javascript_dialogs::AppModalDialogController* dialog =
ui_test_utils::WaitForAppModalDialog();
- CHECK(dialog->native_dialog());
- return dialog->native_dialog();
+ CHECK(dialog->view());
+ return dialog->view();
}
// Note: call |PrepareForDialog| on the relevant WebContents or Browser before
diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc b/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc
index 49c5c4f..1943116 100644
--- a/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc
+++ b/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc
@@ -10,8 +10,8 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/test/browser_test_utils.h"
@@ -67,11 +67,11 @@
// the test to complete.
browser()->tab_strip_model()->CloseAllTabs();
if (has_beforeunload_helper) {
- app_modal::JavaScriptAppModalDialog* alert =
+ javascript_dialogs::AppModalDialogController* alert =
ui_test_utils::WaitForAppModalDialog();
ASSERT_TRUE(alert);
EXPECT_TRUE(alert->is_before_unload_dialog());
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
}
}
};
diff --git a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
index 9819939..298293b 100644
--- a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
+++ b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
@@ -28,11 +28,11 @@
#include "chrome/common/chrome_features.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/guest_view/browser/guest_view_base.h"
#include "components/guest_view/browser/guest_view_manager_delegate.h"
#include "components/guest_view/browser/test_guest_view_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/interstitial_page.h"
@@ -63,8 +63,6 @@
#include "ui/gfx/geometry/point.h"
#include "url/gurl.h"
-using app_modal::JavaScriptAppModalDialog;
-
namespace {
class RedirectObserver : public content::WebContentsObserver {
@@ -627,9 +625,10 @@
browser()->OpenURL(content::OpenURLParams(redirect_url, content::Referrer(),
WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
- JavaScriptAppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
+ javascript_dialogs::AppModalDialogController* alert =
+ ui_test_utils::WaitForAppModalDialog();
EXPECT_TRUE(alert->is_before_unload_dialog());
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
nav_observer.WaitForNavigationFinished();
}
@@ -1231,7 +1230,7 @@
// Cancel the dialog and make sure the tab stays alive.
auto* dialog = ui_test_utils::WaitForAppModalDialog();
- dialog->native_dialog()->CancelAppModalDialog();
+ dialog->view()->CancelAppModalDialog();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(second_web_contents, tab_strip_model->GetActiveWebContents());
EXPECT_EQ(2, browser()->tab_strip_model()->count());
@@ -1243,7 +1242,7 @@
// Accept the dialog and wait for tab close to complete.
content::WebContentsDestroyedWatcher destroyed_watcher(second_web_contents);
dialog = ui_test_utils::WaitForAppModalDialog();
- dialog->native_dialog()->AcceptAppModalDialog();
+ dialog->view()->AcceptAppModalDialog();
destroyed_watcher.Wait();
EXPECT_EQ(first_web_contents, tab_strip_model->GetActiveWebContents());
}
@@ -1290,7 +1289,7 @@
// Cancel the dialog and make sure the tab stays alive.
auto* dialog = ui_test_utils::WaitForAppModalDialog();
- dialog->native_dialog()->CancelAppModalDialog();
+ dialog->view()->CancelAppModalDialog();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(second_web_contents, tab_strip_model->GetActiveWebContents());
EXPECT_EQ(2, browser()->tab_strip_model()->count());
@@ -1302,7 +1301,7 @@
// Accept the dialog and wait for tab close to complete.
content::WebContentsDestroyedWatcher destroyed_watcher(second_web_contents);
dialog = ui_test_utils::WaitForAppModalDialog();
- dialog->native_dialog()->AcceptAppModalDialog();
+ dialog->view()->AcceptAppModalDialog();
destroyed_watcher.Wait();
EXPECT_EQ(first_web_contents, tab_strip_model->GetActiveWebContents());
}
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 97a9b3bb..dc83c0e 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -108,7 +108,7 @@
"interventions/intervention_delegate.h",
"interventions/intervention_infobar_delegate.cc",
"interventions/intervention_infobar_delegate.h",
- "javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h",
+ "javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h",
"javascript_dialogs/javascript_dialog.h",
"javascript_dialogs/javascript_dialog_tab_helper.cc",
"javascript_dialogs/javascript_dialog_tab_helper.h",
@@ -420,7 +420,6 @@
"//chrome/installer/util:with_no_strings",
"//components/about_ui",
"//components/account_id",
- "//components/app_modal",
"//components/autofill/content/browser:risk_proto",
"//components/autofill/core/browser",
"//components/bookmarks/browser",
@@ -461,6 +460,7 @@
"//components/image_fetcher/core",
"//components/infobars/core",
"//components/invalidation/impl",
+ "//components/javascript_dialogs",
"//components/keyed_service/content",
"//components/keyed_service/core",
"//components/language/core/browser",
@@ -815,8 +815,8 @@
"//chrome/browser/android/thin_webview:thin_webview",
"//chrome/browser/image_decoder",
"//chrome/browser/resources/webapks:webapks_ui_resources",
- "//components/app_modal/android:jni_headers",
"//components/embedder_support/android:web_contents_delegate",
+ "//components/javascript_dialogs/android:jni_headers",
"//components/navigation_interception",
"//components/optimization_guide/proto:optimization_guide_proto",
"//components/subresource_filter/core/browser",
@@ -4037,7 +4037,7 @@
deps += [ "//apps/ui/views" ]
}
if (use_aura) {
- sources += [ "views/chrome_javascript_native_dialog_factory_views.cc" ]
+ sources += [ "views/chrome_javascript_app_modal_view_factory_views.cc" ]
deps += [ "//ui/wm/public" ]
}
}
diff --git a/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc
index dbca071..ba7f6e5 100644
--- a/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc
+++ b/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc
@@ -2,22 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h"
+#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h"
#include "base/android/jni_android.h"
#include "base/bind.h"
-#include "components/app_modal/android/javascript_app_modal_dialog_android.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/javascript_dialogs/android/javascript_app_modal_dialog_android.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "content/public/browser/web_contents.h"
-void InstallChromeJavaScriptNativeAppModalDialogFactory() {
- app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
- base::BindRepeating([](app_modal::JavaScriptAppModalDialog* dialog) {
- app_modal::NativeAppModalDialog* d =
- new app_modal::JavascriptAppModalDialogAndroid(
- base::android::AttachCurrentThread(), dialog,
- dialog->web_contents()->GetTopLevelNativeWindow());
- return d;
- }));
+void InstallChromeJavaScriptAppModalDialogViewFactory() {
+ javascript_dialogs::AppModalDialogManager::GetInstance()
+ ->SetNativeDialogFactory(base::BindRepeating(
+ [](javascript_dialogs::AppModalDialogController* controller) {
+ javascript_dialogs::AppModalDialogView* view =
+ new javascript_dialogs::JavascriptAppModalDialogAndroid(
+ base::android::AttachCurrentThread(), controller,
+ controller->web_contents()->GetTopLevelNativeWindow());
+ return view;
+ }));
}
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
index 9c0caf2..e45419e 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -39,11 +39,11 @@
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/search_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/javascript_dialog_manager.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/embedder_support/switches.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/omnibox/browser/autocomplete_result.h"
#include "components/omnibox/browser/omnibox_edit_model.h"
@@ -688,10 +688,10 @@
ui_test_utils::BrowserActivationWaiter alert_waiter(browser());
#endif
bool ignored;
- app_modal::JavaScriptDialogManager::GetInstance()->RunJavaScriptDialog(
+ javascript_dialogs::AppModalDialogManager::GetInstance()->RunJavaScriptDialog(
tab, tab->GetMainFrame(), content::JAVASCRIPT_DIALOG_TYPE_ALERT,
base::string16(), base::string16(), base::DoNothing(), &ignored);
- app_modal::JavaScriptAppModalDialog* dialog =
+ javascript_dialogs::AppModalDialogController* dialog =
ui_test_utils::WaitForAppModalDialog();
ASSERT_TRUE(dialog);
#if !defined(OS_MACOSX)
@@ -703,8 +703,8 @@
#if !defined(OS_MACOSX)
ui_test_utils::BrowserActivationWaiter waiter(popup_browser);
#endif
- app_modal::JavaScriptDialogManager::GetInstance()->HandleJavaScriptDialog(
- tab, true, nullptr);
+ javascript_dialogs::AppModalDialogManager::GetInstance()
+ ->HandleJavaScriptDialog(tab, true, nullptr);
#if !defined(OS_MACOSX)
waiter.WaitForActivation();
#endif
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 77abda6..73e5b786c 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -72,11 +72,11 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/app_modal_dialog_queue.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/embedder_support/switches.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_queue.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "components/omnibox/common/omnibox_focus_state.h"
#include "components/prefs/pref_service.h"
#include "components/sessions/core/command_storage_manager_test_helper.h"
@@ -132,8 +132,6 @@
#include "chrome/browser/browser_process.h"
#endif
-using app_modal::AppModalDialogQueue;
-using app_modal::JavaScriptAppModalDialog;
using base::ASCIIToUTF16;
using content::HostZoomMap;
using content::InterstitialPage;
@@ -144,6 +142,8 @@
using content::WebContents;
using content::WebContentsObserver;
using extensions::Extension;
+using javascript_dialogs::AppModalDialogController;
+using javascript_dialogs::AppModalDialogQueue;
namespace {
@@ -698,7 +698,7 @@
contents->GetMainFrame()->ExecuteJavaScriptForTests(
ASCIIToUTF16("window.location.href = 'about:blank'"),
base::NullCallback());
- JavaScriptAppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
+ AppModalDialogController* alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_TRUE(alert->IsValid());
AppModalDialogQueue* dialog_queue = AppModalDialogQueue::GetInstance();
EXPECT_TRUE(dialog_queue->HasActiveDialog());
@@ -791,7 +791,7 @@
// Navigate to another page, but click cancel in the dialog. Make sure that
// the throbber stops spinning.
chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
- JavaScriptAppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
+ AppModalDialogController* alert = ui_test_utils::WaitForAppModalDialog();
alert->CloseModalDialog();
EXPECT_FALSE(contents->IsLoading());
@@ -822,12 +822,12 @@
->GetMainFrame()
->ExecuteJavaScriptWithUserGestureForTests(
ASCIIToUTF16("w.close(); alert('bar');"));
- JavaScriptAppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
- alert->native_dialog()->AcceptAppModalDialog();
+ AppModalDialogController* alert = ui_test_utils::WaitForAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_FALSE(alert->is_before_unload_dialog());
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
}
// Test that when a page has an onbeforeunload handler, reloading a page shows a
@@ -840,11 +840,11 @@
// Reload the page, and check that we get a "before reload" dialog.
chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
- JavaScriptAppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
+ AppModalDialogController* alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_TRUE(alert->is_reload());
// Proceed with the reload.
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
EXPECT_TRUE(content::WaitForLoadStop(contents));
content::PrepContentsForBeforeUnloadTest(contents);
@@ -859,7 +859,7 @@
EXPECT_FALSE(alert->is_reload());
// Accept the navigation so we end up on a page without a beforeunload hook.
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
}
class BrowserTestWithTabGroupsEnabled : public BrowserTest {
@@ -985,10 +985,10 @@
// The beforeunload handler will run at exit, ensure it does, and then accept
// it to allow shutdown to proceed.
- JavaScriptAppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
+ AppModalDialogController* alert = ui_test_utils::WaitForAppModalDialog();
ASSERT_TRUE(alert);
EXPECT_TRUE(alert->is_before_unload_dialog());
- alert->native_dialog()->AcceptAppModalDialog();
+ alert->view()->AcceptAppModalDialog();
// But wait there's more! If this test times out, it likely means that the
// browser has not been able to quit correctly, indicating there's a
@@ -1766,10 +1766,6 @@
std::move(*callback).Run();
}
-} // namespace
-
-namespace {
-
int GetZoomPercent(content::WebContents* contents,
bool* enable_plus,
bool* enable_minus) {
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
index c662071..426d2b73 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
@@ -11,21 +11,22 @@
#include "base/mac/scoped_nsobject.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "components/app_modal/native_app_modal_dialog.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "components/remote_cocoa/app_shim/alert.h"
#include "components/remote_cocoa/common/alert.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
class PopunderPreventer;
-namespace app_modal {
-class JavaScriptAppModalDialog;
+namespace javascript_dialogs {
+class AppModalDialogController;
}
-class JavaScriptAppModalDialogCocoa : public app_modal::NativeAppModalDialog {
+class JavaScriptAppModalDialogCocoa
+ : public javascript_dialogs::AppModalDialogView {
public:
explicit JavaScriptAppModalDialogCocoa(
- app_modal::JavaScriptAppModalDialog* dialog);
+ javascript_dialogs::AppModalDialogController* controller);
// Overridden from NativeAppModalDialog:
void ShowAppModalDialog() override;
@@ -35,10 +36,6 @@
void CancelAppModalDialog() override;
bool IsShowing() const override;
- app_modal::JavaScriptAppModalDialog* dialog() const {
- return dialog_.get();
- }
-
private:
~JavaScriptAppModalDialogCocoa() override;
@@ -57,7 +54,7 @@
// Mojo interface to the NSAlert.
mojo::Remote<remote_cocoa::mojom::AlertBridge> alert_bridge_;
- std::unique_ptr<app_modal::JavaScriptAppModalDialog> dialog_;
+ std::unique_ptr<javascript_dialogs::AppModalDialogController> controller_;
std::unique_ptr<PopunderPreventer> popunder_preventer_;
int num_buttons_ = 0;
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
index fcce6af9..f26018f 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -13,9 +13,9 @@
#include "base/memory/ptr_util.h"
#import "chrome/browser/chrome_browser_application_mac.h"
#include "chrome/browser/ui/blocked_content/popunder_preventer.h"
-#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/javascript_dialog_manager.h"
+#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "components/remote_cocoa/app_shim/alert.h"
#include "components/remote_cocoa/browser/application_host.h"
#include "components/strings/grit/components_strings.h"
@@ -33,9 +33,9 @@
// JavaScriptAppModalDialogCocoa:
JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa(
- app_modal::JavaScriptAppModalDialog* dialog)
- : dialog_(dialog),
- popunder_preventer_(new PopunderPreventer(dialog->web_contents())),
+ javascript_dialogs::AppModalDialogController* controller)
+ : controller_(controller),
+ popunder_preventer_(new PopunderPreventer(controller->web_contents())),
weak_factory_(this) {}
JavaScriptAppModalDialogCocoa::~JavaScriptAppModalDialogCocoa() {}
@@ -44,26 +44,26 @@
JavaScriptAppModalDialogCocoa::GetAlertParams() {
remote_cocoa::mojom::AlertBridgeInitParamsPtr params =
remote_cocoa::mojom::AlertBridgeInitParams::New();
- params->title = dialog_->title();
- params->message_text = dialog_->message_text();
+ params->title = controller_->title();
+ params->message_text = controller_->message_text();
// Set a blank icon for dialogs with text provided by the page.
// "onbeforeunload" dialogs don't have text provided by the page, so it's
// OK to use the app icon.
- params->hide_application_icon = !dialog_->is_before_unload_dialog();
+ params->hide_application_icon = !controller_->is_before_unload_dialog();
// Determine the names of the dialog buttons based on the flags. "Default"
// is the OK button. "Other" is the cancel button. We don't use the
// "Alternate" button in NSRunAlertPanel.
params->primary_button_text = l10n_util::GetStringUTF16(IDS_APP_OK);
- switch (dialog_->javascript_dialog_type()) {
+ switch (controller_->javascript_dialog_type()) {
case content::JAVASCRIPT_DIALOG_TYPE_ALERT:
num_buttons_ = 1;
break;
case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM:
num_buttons_ = 2;
- if (dialog_->is_before_unload_dialog()) {
- if (dialog_->is_reload()) {
+ if (controller_->is_before_unload_dialog()) {
+ if (controller_->is_reload()) {
params->primary_button_text = l10n_util::GetStringUTF16(
IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL);
} else {
@@ -78,7 +78,7 @@
num_buttons_ = 2;
params->secondary_button_text.emplace(
l10n_util::GetStringUTF16(IDS_APP_CANCEL));
- params->text_field_text.emplace(dialog_->default_prompt_text());
+ params->text_field_text.emplace(controller_->default_prompt_text());
break;
default:
@@ -93,24 +93,24 @@
bool check_box_value) {
switch (disposition) {
case AlertDisposition::PRIMARY_BUTTON:
- dialog_->OnAccept(text_field_value, check_box_value);
+ controller_->OnAccept(text_field_value, check_box_value);
break;
case AlertDisposition::SECONDARY_BUTTON:
// If the user wants to stay on this page, stop quitting (if a quit is in
// progress).
- if (dialog_->is_before_unload_dialog())
+ if (controller_->is_before_unload_dialog())
chrome_browser_application_mac::CancelTerminate();
- dialog_->OnCancel(check_box_value);
+ controller_->OnCancel(check_box_value);
break;
case AlertDisposition::CLOSE:
- dialog_->OnClose();
+ controller_->OnClose();
break;
}
delete this;
}
void JavaScriptAppModalDialogCocoa::OnMojoDisconnect() {
- dialog()->OnClose();
+ controller_->OnClose();
delete this;
}
@@ -130,7 +130,7 @@
// Otherwise create an AlertBridge in-process (but still communicate with it
// over mojo).
auto* application_host = remote_cocoa::ApplicationHost::GetForNativeView(
- dialog_->web_contents()->GetNativeView());
+ controller_->web_contents()->GetNativeView());
if (application_host)
application_host->GetApplication()->CreateAlert(std::move(bridge_receiver));
else
@@ -145,7 +145,7 @@
}
void JavaScriptAppModalDialogCocoa::CloseAppModalDialog() {
- // This function expects that dialog_->OnClose will be called before this
+ // This function expects that controller_->OnClose will be called before this
// function completes.
OnAlertFinished(AlertDisposition::CLOSE, base::string16(),
false /* check_box_value */);
@@ -157,7 +157,8 @@
// expects that OnAlertFinished be called before the function ends), so just
// use the initial values.
OnAlertFinished(AlertDisposition::PRIMARY_BUTTON,
- dialog_->default_prompt_text(), false /* check_box_value */);
+ controller_->default_prompt_text(),
+ false /* check_box_value */);
}
void JavaScriptAppModalDialogCocoa::CancelAppModalDialog() {
@@ -169,15 +170,16 @@
return is_showing_;
}
-void InstallChromeJavaScriptNativeAppModalDialogFactory() {
- app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
- base::BindRepeating([](app_modal::JavaScriptAppModalDialog* dialog) {
- app_modal::NativeAppModalDialog* d =
- new JavaScriptAppModalDialogCocoa(dialog);
- // Match Views by activating the tab during creation (rather than when
- // showing).
- dialog->web_contents()->GetDelegate()->ActivateContents(
- dialog->web_contents());
- return d;
- }));
+void InstallChromeJavaScriptAppModalDialogViewFactory() {
+ javascript_dialogs::AppModalDialogManager::GetInstance()
+ ->SetNativeDialogFactory(base::BindRepeating(
+ [](javascript_dialogs::AppModalDialogController* controller) {
+ javascript_dialogs::AppModalDialogView* view =
+ new JavaScriptAppModalDialogCocoa(controller);
+ // Match Views by activating the tab during creation (rather than
+ // when showing).
+ controller->web_contents()->GetDelegate()->ActivateContents(
+ controller->web_contents());
+ return view;
+ }));
}
diff --git a/chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h b/chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h
new file mode 100644
index 0000000..564fd59
--- /dev/null
+++ b/chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h
@@ -0,0 +1,10 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_CHROME_JAVASCRIPT_APP_MODAL_DIALOG_VIEW_FACTORY_H_
+#define CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_CHROME_JAVASCRIPT_APP_MODAL_DIALOG_VIEW_FACTORY_H_
+
+void InstallChromeJavaScriptAppModalDialogViewFactory();
+
+#endif // CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_CHROME_JAVASCRIPT_APP_MODAL_DIALOG_VIEW_FACTORY_H_
diff --git a/chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h b/chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h
deleted file mode 100644
index 6b45d10..0000000
--- a/chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_CHROME_JAVASCRIPT_NATIVE_APP_MODAL_DIALOG_FACTORY_H_
-#define CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_CHROME_JAVASCRIPT_NATIVE_APP_MODAL_DIALOG_FACTORY_H_
-
-void InstallChromeJavaScriptNativeAppModalDialogFactory();
-
-#endif // CHROME_BROWSER_UI_JAVASCRIPT_DIALOGS_CHROME_JAVASCRIPT_NATIVE_APP_MODAL_DIALOG_FACTORY_H_
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
index 6df55d78..228b6445 100644
--- a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
+++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
@@ -12,7 +12,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/ui/javascript_dialogs/javascript_dialog.h"
-#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "components/navigation_metrics/navigation_metrics.h"
#include "components/ukm/content/source_url_recorder.h"
#include "content/public/browser/devtools_agent_host.h"
@@ -24,8 +24,8 @@
namespace {
-app_modal::JavaScriptDialogManager* AppModalDialogManager() {
- return app_modal::JavaScriptDialogManager::GetInstance();
+javascript_dialogs::AppModalDialogManager* AppModalDialogManager() {
+ return javascript_dialogs::AppModalDialogManager::GetInstance();
}
// The relationship between origins in displayed dialogs.
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper_delegate_desktop.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper_delegate_desktop.cc
index ad4f327..17e3cef 100644
--- a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper_delegate_desktop.cc
+++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper_delegate_desktop.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
#include "chrome/browser/ui/tab_modal_confirm_dialog.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "components/navigation_metrics/navigation_metrics.h"
#include "components/ukm/content/source_url_recorder.h"
#include "content/public/browser/devtools_agent_host.h"
diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc
similarity index 67%
rename from chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
rename to chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc
index e3819e6..d3a5023 100644
--- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
+++ b/chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_app_modal_dialog_factory.h"
+#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h"
#include "base/macros.h"
#include "build/build_config.h"
-#include "components/app_modal/javascript_dialog_manager.h"
#include "components/constrained_window/constrained_window_views.h"
+#include "components/javascript_dialogs/app_modal_dialog_manager.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
@@ -15,8 +15,8 @@
#include "chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h"
#else
#include "chrome/browser/ui/blocked_content/popunder_preventer.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/views/javascript_app_modal_dialog_views.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/views/app_modal_dialog_view_views.h"
#endif
#if defined(USE_AURA)
@@ -27,11 +27,11 @@
#if !defined(USE_X11)
class ChromeJavaScriptAppModalDialogViews
- : public app_modal::JavaScriptAppModalDialogViews {
+ : public javascript_dialogs::AppModalDialogViewViews {
public:
explicit ChromeJavaScriptAppModalDialogViews(
- app_modal::JavaScriptAppModalDialog* parent)
- : app_modal::JavaScriptAppModalDialogViews(parent),
+ javascript_dialogs::AppModalDialogController* parent)
+ : javascript_dialogs::AppModalDialogViewViews(parent),
popunder_preventer_(parent->web_contents()) {}
~ChromeJavaScriptAppModalDialogViews() override = default;
@@ -42,9 +42,9 @@
};
#endif
-app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog(
- app_modal::JavaScriptAppModalDialog* dialog) {
- app_modal::JavaScriptAppModalDialogViews* d = nullptr;
+javascript_dialogs::AppModalDialogView* CreateNativeJavaScriptDialog(
+ javascript_dialogs::AppModalDialogController* dialog) {
+ javascript_dialogs::AppModalDialogViewViews* d = nullptr;
#if defined(USE_X11)
d = new JavaScriptAppModalDialogViewsX11(dialog);
#else
@@ -67,7 +67,8 @@
} // namespace
-void InstallChromeJavaScriptNativeAppModalDialogFactory() {
- app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
- base::BindRepeating(&CreateNativeJavaScriptDialog));
+void InstallChromeJavaScriptAppModalDialogViewFactory() {
+ javascript_dialogs::AppModalDialogManager::GetInstance()
+ ->SetNativeDialogFactory(
+ base::BindRepeating(&CreateNativeJavaScriptDialog));
}
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 9038d79..d47434c 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -131,10 +131,10 @@
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/theme_resources.h"
-#include "components/app_modal/app_modal_dialog_queue.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/autofill/core/common/autofill_payments_features.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_queue.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "components/omnibox/browser/omnibox_popup_model.h"
#include "components/omnibox/browser/omnibox_popup_view.h"
#include "components/omnibox/browser/omnibox_view.h"
@@ -1924,10 +1924,10 @@
}
bool BrowserView::CanActivate() const {
- app_modal::AppModalDialogQueue* queue =
- app_modal::AppModalDialogQueue::GetInstance();
- if (!queue->active_dialog() || !queue->active_dialog()->native_dialog() ||
- !queue->active_dialog()->native_dialog()->IsShowing()) {
+ javascript_dialogs::AppModalDialogQueue* queue =
+ javascript_dialogs::AppModalDialogQueue::GetInstance();
+ if (!queue->active_dialog() || !queue->active_dialog()->view() ||
+ !queue->active_dialog()->view()->IsShowing()) {
return true;
}
@@ -3157,8 +3157,8 @@
void BrowserView::ActivateAppModalDialog() const {
// If another browser is app modal, flash and activate the modal browser.
- app_modal::JavaScriptAppModalDialog* active_dialog =
- app_modal::AppModalDialogQueue::GetInstance()->active_dialog();
+ javascript_dialogs::AppModalDialogController* active_dialog =
+ javascript_dialogs::AppModalDialogQueue::GetInstance()->active_dialog();
if (!active_dialog)
return;
@@ -3169,7 +3169,7 @@
modal_browser->window()->Activate();
}
- app_modal::AppModalDialogQueue::GetInstance()->ActivateModalDialog();
+ javascript_dialogs::AppModalDialogQueue::GetInstance()->ActivateModalDialog();
}
bool BrowserView::FindCommandIdForAccelerator(
diff --git a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.cc b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.cc
index 1f6beca..31599da 100644
--- a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.cc
+++ b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.cc
@@ -7,12 +7,12 @@
#include "chrome/browser/ui/blocked_content/popunder_preventer.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
#include "ui/views/widget/widget.h"
JavaScriptAppModalDialogViewsX11::JavaScriptAppModalDialogViewsX11(
- app_modal::JavaScriptAppModalDialog* parent)
- : app_modal::JavaScriptAppModalDialogViews(parent),
+ javascript_dialogs::AppModalDialogController* parent)
+ : javascript_dialogs::AppModalDialogViewViews(parent),
popunder_preventer_(new PopunderPreventer(parent->web_contents())) {
chrome::RecordDialogCreation(
chrome::DialogIdentifier::JAVA_SCRIPT_APP_MODAL_X11);
diff --git a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
index 38da771..68103f3 100644
--- a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
+++ b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
@@ -8,17 +8,17 @@
#include <memory>
#include "base/macros.h"
-#include "components/app_modal/views/javascript_app_modal_dialog_views.h"
+#include "components/javascript_dialogs/views/app_modal_dialog_view_views.h"
class JavascriptAppModalEventBlockerX11;
class PopunderPreventer;
-// JavaScriptAppModalDialog implmentation for linux desktop.
+// AppModalDialogView implementation for linux desktop.
class JavaScriptAppModalDialogViewsX11
- : public app_modal::JavaScriptAppModalDialogViews {
+ : public javascript_dialogs::AppModalDialogViewViews {
public:
explicit JavaScriptAppModalDialogViewsX11(
- app_modal::JavaScriptAppModalDialog* parent);
+ javascript_dialogs::AppModalDialogController* parent);
~JavaScriptAppModalDialogViewsX11() override;
// JavaScriptAppModalDialogViews:
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index 62d1ce387..7e5eee7 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -21,9 +21,9 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal/javascript_app_modal_dialog.h"
-#include "components/app_modal/native_app_modal_dialog.h"
#include "components/embedder_support/switches.h"
+#include "components/javascript_dialogs/app_modal_dialog_controller.h"
+#include "components/javascript_dialogs/app_modal_dialog_view.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
@@ -193,12 +193,12 @@
// If |accept| is true, simulates user clicking OK, otherwise simulates
// clicking Cancel.
void ClickModalDialogButton(bool accept) {
- app_modal::JavaScriptAppModalDialog* dialog =
+ javascript_dialogs::AppModalDialogController* dialog =
ui_test_utils::WaitForAppModalDialog();
if (accept)
- dialog->native_dialog()->AcceptAppModalDialog();
+ dialog->view()->AcceptAppModalDialog();
else
- dialog->native_dialog()->CancelAppModalDialog();
+ dialog->view()->CancelAppModalDialog();
}
void PrepareForDialog(Browser* browser) {
