Chromium Code Reviews| Index: chrome/browser/chrome_browser_main_android.cc |
| diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc |
| index a39f51f4325544833030837a417f92931505cebb..5cf9e034052ffb1449ec913473e202d39d2a4c21 100644 |
| --- a/chrome/browser/chrome_browser_main_android.cc |
| +++ b/chrome/browser/chrome_browser_main_android.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
| #include "chrome/browser/google/google_search_counter_android.h" |
| #include "chrome/browser/signin/signin_manager_factory.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_linux.h" |
| @@ -27,6 +28,7 @@ ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid( |
| } |
| ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { |
| + SetJavaScriptDialogManagerClient(nullptr); |
| } |
| void ChromeBrowserMainPartsAndroid::PreProfileInit() { |
| @@ -39,6 +41,8 @@ void ChromeBrowserMainPartsAndroid::PreProfileInit() { |
| #else |
| bool breakpad_enabled = false; |
| #endif |
| + SetJavaScriptDialogManagerClient( |
|
msw
2014/10/30 00:20:31
Does this need to happen so early? Can someone mor
|
| + make_scoped_ptr(new ChromeJavaScriptDialogManagerClient)); |
|
msw
2014/10/30 00:20:31
Why do android, mac, and views all do this separat
oshima
2014/10/31 15:54:45
Moved to chrome_browser_main.cc. Let me know if yo
|
| // Allow Breakpad to be enabled in Chromium builds for testing purposes. |
| if (!breakpad_enabled) |