diff options
Diffstat (limited to 'chrome/browser')
19 files changed, 73 insertions, 52 deletions
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc index 8a0c196..56da4aa 100644 --- a/chrome/browser/android/chrome_web_contents_delegate_android.cc +++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc @@ -216,7 +216,7 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply( content::JavaScriptDialogManager* ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager( WebContents* source) { - return GetJavaScriptDialogManagerInstance(); + return app_modal::JavaScriptDialogManager::GetInstance(); } void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission( diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 30e35e9..75993b8 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -1070,7 +1070,7 @@ void ChromeBrowserMainParts::PreProfileInit() { #endif // OS_ANDROID #if defined(ENABLE_EXTENSIONS) - InstallJavaScriptDialogExtensionsClient(); + javascript_dialog_extensions_client::InstallClient(); #endif #if !defined(OS_IOS) diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc index 2709134..30156bf 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc @@ -46,6 +46,8 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +using app_modal::AppModalDialog; +using app_modal::JavaScriptAppModalDialog; using net::test_server::BasicHttpResponse; using net::test_server::HttpRequest; using net::test_server::HttpResponse; diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index de34cff..b0c8bf0 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -52,6 +52,9 @@ #include "net/socket/tcp_listen_socket.h" #include "net/test/spawned_test_server/spawned_test_server.h" +using app_modal::AppModalDialog; +using app_modal::JavaScriptAppModalDialog; +using app_modal::NativeAppModalDialog; using content::BrowserThread; using content::DevToolsAgentHost; using content::NavigationController; diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index 766c158..9aece03 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc @@ -24,7 +24,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { host->host_contents()->GetMainFrame()->ExecuteJavaScript( base::ASCIIToUTF16("alert('This should not crash.');")); - AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); + app_modal::AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); ASSERT_TRUE(alert); alert->CloseModalDialog(); } diff --git a/chrome/browser/extensions/chrome_extension_host_delegate.cc b/chrome/browser/extensions/chrome_extension_host_delegate.cc index e0adf5a..c8d2b58 100644 --- a/chrome/browser/extensions/chrome_extension_host_delegate.cc +++ b/chrome/browser/extensions/chrome_extension_host_delegate.cc @@ -35,7 +35,7 @@ void ChromeExtensionHostDelegate::OnRenderViewCreatedForBackgroundPage( content::JavaScriptDialogManager* ChromeExtensionHostDelegate::GetJavaScriptDialogManager() { - return GetJavaScriptDialogManagerInstance(); + return app_modal::JavaScriptDialogManager::GetInstance(); } void ChromeExtensionHostDelegate::CreateTab(content::WebContents* web_contents, diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 1353131..d25219f9 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -216,7 +216,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForDialog) { ASSERT_TRUE(extension); // The test extension opens a dialog on installation. - AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog(); + app_modal::AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog(); ASSERT_TRUE(dialog); // With the dialog open the background page is still alive. diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc index a81ce65..4cb1584 100644 --- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc +++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc @@ -49,11 +49,11 @@ namespace { -NativeAppModalDialog* GetNextDialog() { - AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog(); +app_modal::NativeAppModalDialog* GetNextDialog() { + app_modal::AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog(); EXPECT_TRUE(dialog->IsJavaScriptModalDialog()); - JavaScriptAppModalDialog* js_dialog = - static_cast<JavaScriptAppModalDialog*>(dialog); + app_modal::JavaScriptAppModalDialog* js_dialog = + static_cast<app_modal::JavaScriptAppModalDialog*>(dialog); CHECK(js_dialog->native_dialog()); return js_dialog->native_dialog(); } diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc index ff09409..34a8b99 100644 --- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc +++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc @@ -23,7 +23,7 @@ using base::android::ScopedJavaLocalRef; JavascriptAppModalDialogAndroid::JavascriptAppModalDialogAndroid( JNIEnv* env, - JavaScriptAppModalDialog* dialog, + app_modal::JavaScriptAppModalDialog* dialog, gfx::NativeWindow parent) : dialog_(dialog), parent_jobject_weak_ref_(env, parent->GetJavaObject().obj()) { @@ -131,7 +131,8 @@ const ScopedJavaGlobalRef<jobject>& // static jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) { - AppModalDialog* dialog = AppModalDialogQueue::GetInstance()->active_dialog(); + app_modal::AppModalDialog* dialog = + app_modal::AppModalDialogQueue::GetInstance()->active_dialog(); if (!dialog || !dialog->native_dialog()) return NULL; @@ -159,14 +160,14 @@ JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() { namespace { class ChromeJavaScriptNativeDialogAndroidFactory - : public JavaScriptNativeDialogFactory { + : public app_modal::JavaScriptNativeDialogFactory { public: ChromeJavaScriptNativeDialogAndroidFactory() {} ~ChromeJavaScriptNativeDialogAndroidFactory() override {} private: - NativeAppModalDialog* CreateNativeJavaScriptDialog( - JavaScriptAppModalDialog* dialog, + app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog( + app_modal::JavaScriptAppModalDialog* dialog, gfx::NativeWindow parent_window) override { return new JavascriptAppModalDialogAndroid( base::android::AttachCurrentThread(), @@ -179,7 +180,8 @@ class ChromeJavaScriptNativeDialogAndroidFactory } // namespace void InstallChromeJavaScriptNativeDialogFactory() { - SetJavaScriptNativeDialogFactory( - make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); + app_modal::JavaScriptDialogManager::GetInstance()-> + SetNativeDialogFactory( + make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); } diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h index bf748e4..3a84734 100644 --- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h +++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h @@ -12,11 +12,13 @@ class JavaScriptAppModalDialog; -class JavascriptAppModalDialogAndroid : public NativeAppModalDialog { +class JavascriptAppModalDialogAndroid + : public app_modal::NativeAppModalDialog { public: - JavascriptAppModalDialogAndroid(JNIEnv* env, - JavaScriptAppModalDialog* dialog, - gfx::NativeWindow parent); + JavascriptAppModalDialogAndroid( + JNIEnv* env, + app_modal::JavaScriptAppModalDialog* dialog, + gfx::NativeWindow parent); // NativeAppModalDialog: virtual int GetAppModalDialogButtons() const override; @@ -41,7 +43,7 @@ class JavascriptAppModalDialogAndroid : public NativeAppModalDialog { // The object deletes itself. virtual ~JavascriptAppModalDialogAndroid(); - scoped_ptr<JavaScriptAppModalDialog> dialog_; + scoped_ptr<app_modal::JavaScriptAppModalDialog> dialog_; base::android::ScopedJavaGlobalRef<jobject> dialog_jobject_; JavaObjectWeakGlobalRef parent_jobject_weak_ref_; diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 0d269e3..f5d4afa 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -1624,7 +1624,7 @@ void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( WebContents* source) { - return GetJavaScriptDialogManagerInstance(); + return app_modal::JavaScriptDialogManager::GetInstance(); } content::ColorChooser* Browser::OpenColorChooser( diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 03a0141..c7e91e18 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -102,6 +102,9 @@ #include "chrome/browser/browser_process.h" #endif +using app_modal::AppModalDialog; +using app_modal::AppModalDialogQueue; +using app_modal::JavaScriptAppModalDialog; using base::ASCIIToUTF16; using content::InterstitialPage; using content::HostZoomMap; 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 1324def..88230f3 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h @@ -18,9 +18,11 @@ class NSAlert; class JavaScriptAppModalDialogHelper; #endif -class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog { +class JavaScriptAppModalDialogCocoa + : public app_modal::NativeAppModalDialog { public: - explicit JavaScriptAppModalDialogCocoa(JavaScriptAppModalDialog* dialog); + explicit JavaScriptAppModalDialogCocoa( + app_modal::JavaScriptAppModalDialog* dialog); virtual ~JavaScriptAppModalDialogCocoa(); // Overridden from NativeAppModalDialog: @@ -31,13 +33,15 @@ class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog { void AcceptAppModalDialog() override; void CancelAppModalDialog() override; - JavaScriptAppModalDialog* dialog() const { return dialog_.get(); } + app_modal::JavaScriptAppModalDialog* dialog() const { + return dialog_.get(); + } private: // Returns the NSAlert associated with the modal dialog. NSAlert* GetAlert() const; - scoped_ptr<JavaScriptAppModalDialog> dialog_; + scoped_ptr<app_modal::JavaScriptAppModalDialog> dialog_; // Created in the constructor and destroyed in the destructor. base::scoped_nsobject<JavaScriptAppModalDialogHelper> helper_; 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 b0d27b4..3f7165c 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm @@ -219,7 +219,7 @@ enum AlertAction { // JavaScriptAppModalDialogCocoa, public: JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa( - JavaScriptAppModalDialog* dialog) + app_modal::JavaScriptAppModalDialog* dialog) : dialog_(dialog), helper_(NULL) { // Determine the names of the dialog buttons based on the flags. "Default" @@ -440,14 +440,14 @@ void JavaScriptAppModalDialogCocoa::CancelAppModalDialog() { namespace { class ChromeJavaScriptNativeDialogCocoaFactory - : public JavaScriptNativeDialogFactory { + : public app_modal::JavaScriptNativeDialogFactory { public: ChromeJavaScriptNativeDialogCocoaFactory() {} ~ChromeJavaScriptNativeDialogCocoaFactory() override {} private: - NativeAppModalDialog* CreateNativeJavaScriptDialog( - JavaScriptAppModalDialog* dialog, + app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog( + app_modal::JavaScriptAppModalDialog* dialog, gfx::NativeWindow parent_window) override { return new JavaScriptAppModalDialogCocoa(dialog); } @@ -458,6 +458,7 @@ class ChromeJavaScriptNativeDialogCocoaFactory } // namespace void InstallChromeJavaScriptNativeDialogFactory() { - SetJavaScriptNativeDialogFactory( - make_scoped_ptr(new ChromeJavaScriptNativeDialogCocoaFactory)); + app_modal::JavaScriptDialogManager::GetInstance()-> + SetNativeDialogFactory( + make_scoped_ptr(new ChromeJavaScriptNativeDialogCocoaFactory)); } diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc index 1f7ab42..060c43b 100644 --- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc +++ b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc @@ -17,20 +17,20 @@ namespace { class ChromeJavaScriptNativeDialogViewsFactory - : public JavaScriptNativeDialogFactory { + : public app_modal::JavaScriptNativeDialogFactory { public: ChromeJavaScriptNativeDialogViewsFactory() {} ~ChromeJavaScriptNativeDialogViewsFactory() override {} private: - NativeAppModalDialog* CreateNativeJavaScriptDialog( - JavaScriptAppModalDialog* dialog, + app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog( + app_modal::JavaScriptAppModalDialog* dialog, gfx::NativeWindow parent_window) override{ - JavaScriptAppModalDialogViews* d = nullptr; + app_modal::JavaScriptAppModalDialogViews* d = nullptr; #if defined(USE_X11) && !defined(OS_CHROMEOS) d = new JavaScriptAppModalDialogViewsX11(dialog); #else - d = new JavaScriptAppModalDialogViews(dialog); + d = new app_modal::JavaScriptAppModalDialogViews(dialog); #endif constrained_window::CreateBrowserModalDialogViews(d, parent_window); return d; @@ -42,6 +42,7 @@ class ChromeJavaScriptNativeDialogViewsFactory } // namespace void InstallChromeJavaScriptNativeDialogFactory() { - SetJavaScriptNativeDialogFactory( - make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory)); + app_modal::JavaScriptDialogManager::GetInstance()-> + SetNativeDialogFactory( + make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory)); } diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 7c92fed..caff0f4 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1514,14 +1514,15 @@ bool BrowserView::CanMinimize() const { } bool BrowserView::CanActivate() const { - if (!AppModalDialogQueue::GetInstance()->active_dialog() || - !AppModalDialogQueue::GetInstance()->active_dialog()->native_dialog()) + app_modal::AppModalDialogQueue* queue = + app_modal::AppModalDialogQueue::GetInstance(); + if (!queue->active_dialog() || !queue->active_dialog()->native_dialog()) return true; #if defined(USE_AURA) && defined(OS_CHROMEOS) // On Aura window manager controls all windows so settings focus via PostTask // will make only worse because posted task will keep trying to steal focus. - AppModalDialogQueue::GetInstance()->ActivateModalDialog(); + queue->ActivateModalDialog(); #else // If another browser is app modal, flash and activate the modal browser. This // has to be done in a post task, otherwise if the user clicked on a window @@ -2482,8 +2483,8 @@ bool BrowserView::DoCutCopyPasteForWebContents( void BrowserView::ActivateAppModalDialog() const { // If another browser is app modal, flash and activate the modal browser. - AppModalDialog* active_dialog = - AppModalDialogQueue::GetInstance()->active_dialog(); + app_modal::AppModalDialog* active_dialog = + app_modal::AppModalDialogQueue::GetInstance()->active_dialog(); if (!active_dialog) return; @@ -2494,7 +2495,7 @@ void BrowserView::ActivateAppModalDialog() const { modal_browser->window()->Activate(); } - AppModalDialogQueue::GetInstance()->ActivateModalDialog(); + app_modal::AppModalDialogQueue::GetInstance()->ActivateModalDialog(); } int BrowserView::GetMaxTopInfoBarArrowHeight() { 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 d11b2d5..68efee2 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 @@ -8,8 +8,8 @@ #include "ui/views/widget/widget.h" JavaScriptAppModalDialogViewsX11::JavaScriptAppModalDialogViewsX11( - JavaScriptAppModalDialog* parent) - : JavaScriptAppModalDialogViews(parent) {} + app_modal::JavaScriptAppModalDialog* parent) + : app_modal::JavaScriptAppModalDialogViews(parent) {} JavaScriptAppModalDialogViewsX11::~JavaScriptAppModalDialogViewsX11() { } 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 7d1171e..1a942c3 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 @@ -11,9 +11,11 @@ class JavascriptAppModalEventBlockerX11; // JavaScriptAppModalDialog implmentation for linux desktop. -class JavaScriptAppModalDialogViewsX11 : public JavaScriptAppModalDialogViews { +class JavaScriptAppModalDialogViewsX11 + : public app_modal::JavaScriptAppModalDialogViews { public: - explicit JavaScriptAppModalDialogViewsX11(JavaScriptAppModalDialog* parent); + explicit JavaScriptAppModalDialogViewsX11( + app_modal::JavaScriptAppModalDialog* parent); virtual ~JavaScriptAppModalDialogViewsX11(); // JavaScriptAppModalDialogViews: diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index befef6d..4276730 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc @@ -178,10 +178,10 @@ class UnloadTest : public InProcessBrowserTest { // If |accept| is true, simulates user clicking OK, otherwise simulates // clicking Cancel. void ClickModalDialogButton(bool accept) { - AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog(); + app_modal::AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog(); ASSERT_TRUE(dialog->IsJavaScriptModalDialog()); - JavaScriptAppModalDialog* js_dialog = - static_cast<JavaScriptAppModalDialog*>(dialog); + app_modal::JavaScriptAppModalDialog* js_dialog = + static_cast<app_modal::JavaScriptAppModalDialog*>(dialog); if (accept) js_dialog->native_dialog()->AcceptAppModalDialog(); else |