Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index 6ab5340fc15c65e8b1683dcbaadd3f2439c3e8b8..4d755d2d684cbaa588c90fcc6f71302f06bdaffc 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -190,12 +190,17 @@ |
#if defined(ENABLE_EXTENSIONS) |
#include "chrome/browser/extensions/startup_helper.h" |
#include "extensions/browser/extension_protocols.h" |
+#include "extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h" |
#endif |
#if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) |
#include "printing/printed_document.h" |
#endif |
+#if defined(OS_MACOSX) || defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) |
+#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h" |
+#endif |
+ |
#if defined(ENABLE_RLZ) |
#include "chrome/browser/rlz/rlz.h" |
#endif |
@@ -1060,6 +1065,14 @@ void ChromeBrowserMainParts::PreProfileInit() { |
base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete)); |
} |
#endif // OS_ANDROID |
+ |
+#if defined(ENABLE_EXTENSIONS) |
+ InstallJavaScriptDialogExtensionsClient(); |
pkotwicz
2014/10/31 17:02:43
We are leaking the pointer here. Does it matter?
pkotwicz
2014/10/31 17:07:41
Never mind, I stand corrected
|
+#endif |
+ |
+#if defined(OS_MACOSX) || defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) |
+ InstallChromeJavaScriptNativeDialogFactory(); |
+#endif |
} |
void ChromeBrowserMainParts::PostProfileInit() { |