chrome/browser/chrome_browser_main.cc - Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | chrome/browser/extensions/chrome_extension_host_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 48e78ea8a92c668dd6211a47ed568f96ede7503c..b1cef215e9409a9ac67e2d9d83154cb00575924e 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_IOS)

Lei Zhang 2014/11/06 03:47:38 nit: Group the OS_FOO #ifdefs above the DISABLE/EN

oshima 2014/11/06 06:32:06 Done.

+#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

@@ -1061,6 +1066,14 @@ void ChromeBrowserMainParts::PreProfileInit() {

base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete));

}

#endif // OS_ANDROID

+#if defined(ENABLE_EXTENSIONS)

+ InstallJavaScriptDialogExtensionsClient();

+#endif

+#if !defined(OS_IOS)

+ InstallChromeJavaScriptNativeDialogFactory();

+#endif

}

void ChromeBrowserMainParts::PostProfileInit() {