| Index: content/shell/browser/shell_javascript_dialog_manager.cc
|
| diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc
|
| index 7f3b678ea7f47784e6e1c16dab09cd4e828e2016..ef284e264c8abec15a27c22d73d06442b4edf141 100644
|
| --- a/content/shell/browser/shell_javascript_dialog_manager.cc
|
| +++ b/content/shell/browser/shell_javascript_dialog_manager.cc
|
| @@ -43,7 +43,7 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
|
| return;
|
| }
|
|
|
| -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
|
| +#if defined(OS_MACOSX) || defined(OS_WIN)
|
| *did_suppress_message = false;
|
|
|
| if (dialog_) {
|
| @@ -88,7 +88,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
|
| return;
|
| }
|
|
|
| -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
|
| +#if defined(OS_MACOSX) || defined(OS_WIN)
|
| if (dialog_) {
|
| // Seriously!?
|
| callback.Run(true, base::string16());
|
| @@ -117,7 +117,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
|
|
|
| void ShellJavaScriptDialogManager::CancelActiveAndPendingDialogs(
|
| WebContents* web_contents) {
|
| -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
|
| +#if defined(OS_MACOSX) || defined(OS_WIN)
|
| if (dialog_) {
|
| dialog_->Cancel();
|
| dialog_.reset();
|
| @@ -132,7 +132,7 @@ void ShellJavaScriptDialogManager::WebContentsDestroyed(
|
| }
|
|
|
| void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
|
| -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
|
| +#if defined(OS_MACOSX) || defined(OS_WIN)
|
| DCHECK_EQ(dialog, dialog_.get());
|
| dialog_.reset();
|
| #else
|
|
|