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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: similarity=30 Created 6 years, 2 months 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/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() {

Powered by Google App Engine
This is Rietveld 408576698