From 7fc838215af759eb66e38be4cf2be1ff50b69e51 Mon Sep 17 00:00:00 2001 From: "cem.kocagil@gmail.com" Date: Fri, 30 Mar 2012 19:53:29 +0000 Subject: Add JavaScript dialogs functionality to content_shell on Windows BUG=120155 TEST=JavaScript dialogs should work in content_shell on Windows Review URL: http://codereview.chromium.org/9918013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129904 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/shell_javascript_dialog_creator.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'content/shell/shell_javascript_dialog_creator.cc') diff --git a/content/shell/shell_javascript_dialog_creator.cc b/content/shell/shell_javascript_dialog_creator.cc index d6b100c..b0dc5a1 100644 --- a/content/shell/shell_javascript_dialog_creator.cc +++ b/content/shell/shell_javascript_dialog_creator.cc @@ -26,7 +26,7 @@ void ShellJavaScriptDialogCreator::RunJavaScriptDialog( const string16& default_prompt_text, const DialogClosedCallback& callback, bool* did_suppress_message) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_WIN) *did_suppress_message = false; if (dialog_.get()) { @@ -56,7 +56,7 @@ void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog( const string16& message_text, bool is_reload, const DialogClosedCallback& callback) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_WIN) if (dialog_.get()) { // Seriously!? callback.Run(true, string16()); @@ -81,7 +81,7 @@ void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog( void ShellJavaScriptDialogCreator::ResetJavaScriptState( WebContents* web_contents) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_WIN) if (dialog_.get()) { dialog_->Cancel(); dialog_.reset(); @@ -92,7 +92,7 @@ void ShellJavaScriptDialogCreator::ResetJavaScriptState( } void ShellJavaScriptDialogCreator::DialogClosed(ShellJavaScriptDialog* dialog) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_WIN) DCHECK_EQ(dialog, dialog_.get()); dialog_.reset(); #else -- cgit v1.1