Index: chrome/browser/chrome_browser_main_mac.mm |
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm |
index bfbe7eae4e377c560e70877d4d09b3c8fae05b53..1e7a0a9b4c7dd12c9d4ee27b5a8acc608885275f 100644 |
--- a/chrome/browser/chrome_browser_main_mac.mm |
+++ b/chrome/browser/chrome_browser_main_mac.mm |
@@ -22,6 +22,7 @@ |
#import "chrome/browser/mac/keystone_glue.h" |
#include "chrome/browser/mac/mac_startup_profiler.h" |
#include "chrome/browser/ui/app_list/app_list_service.h" |
+#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_dialog_manager_client.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
#include "components/crash/app/breakpad_mac.h" |
@@ -159,6 +160,7 @@ ChromeBrowserMainPartsMac::ChromeBrowserMainPartsMac( |
} |
ChromeBrowserMainPartsMac::~ChromeBrowserMainPartsMac() { |
+ SetJavaScriptDialogManagerClient(nullptr); |
} |
void ChromeBrowserMainPartsMac::PreEarlyInitialization() { |
@@ -268,6 +270,9 @@ void ChromeBrowserMainPartsMac::PostMainMessageLoopStart() { |
} |
void ChromeBrowserMainPartsMac::PreProfileInit() { |
+ SetJavaScriptDialogManagerClient( |
+ make_scoped_ptr(new ChromeJavaScriptDialogManagerClient)); |
+ |
MacStartupProfiler::GetInstance()->Profile( |
MacStartupProfiler::PRE_PROFILE_INIT); |
ChromeBrowserMainPartsPosix::PreProfileInit(); |