Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3675)

Unified Diff: chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
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 8a40a2ff9ec09ef12477c3e38f666071b47771dc..84058ee4ebb7134c375b2a5551127f0875084a2f 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_dialogs::JavaScriptNativeDialogFactory {
public:
ChromeJavaScriptNativeDialogViewsFactory() {}
~ChromeJavaScriptNativeDialogViewsFactory() override {}
private:
- NativeAppModalDialog* CreateNativeJavaScriptDialog(
- JavaScriptAppModalDialog* dialog,
+ app_modal_dialogs::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+ app_modal_dialogs::JavaScriptAppModalDialog* dialog,
gfx::NativeWindow parent_window) override{
- JavaScriptAppModalDialogViews* d = nullptr;
+ app_modal_dialogs::JavaScriptAppModalDialogViews* d = nullptr;
#if defined(USE_X11) && !defined(OS_CHROMEOS)
d = new JavaScriptAppModalDialogViewsX11(dialog);
#else
- d = new JavaScriptAppModalDialogViews(dialog);
+ d = new app_modal_dialogs::JavaScriptAppModalDialogViews(dialog);
#endif
CreateBrowserModalDialogViews(d, parent_window);
return d;
@@ -42,6 +42,7 @@ class ChromeJavaScriptNativeDialogViewsFactory
} // namespace
void InstallChromeJavaScriptNativeDialogFactory() {
- SetJavaScriptNativeDialogFactory(
- make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
+ app_modal_dialogs::JavaScriptDialogManager::GetInstance()->
+ SetNativeDialogFactory(
+ make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
}

Powered by Google App Engine
This is Rietveld 408576698