Make app modal dialogs (from javascript) actually be app modal. This

is similar to the behavior on Windows, although they only fake app
modality.

BUG=18123

Review URL: http://codereview.chromium.org/164296


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23052 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 32 insertions, 1 deletions

diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc
index 40b04ed..0191e84 100644
--- a/chrome/browser/app_modal_dialog_gtk.cc
+++ b/chrome/browser/app_modal_dialog_gtk.cc
@@ -10,6 +10,8 @@
 #include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "chrome/browser/browser_list.h"
+#include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "grit/generated_resources.h"
@@ -60,6 +62,17 @@ void OnDialogResponse(GtkDialog* dialog, gint response_id,
       NOTREACHED();
   }
   gtk_widget_destroy(GTK_WIDGET(dialog));
+
+  // Now that the dialog is gone, we can put all the  windows into separate
+  // window groups so other dialogs are no longer app modal.
+  for (BrowserList::const_iterator it = BrowserList::begin();
+       it != BrowserList::end(); ++it) {
+    GtkWindowGroup* window_group = gtk_window_group_new();
+    BrowserWindowGtk* window = static_cast<BrowserWindowGtk*>((*it)->window());
+    gtk_window_group_add_window(window_group, window->window());
+    g_object_unref(window_group);
+  }
+
   delete app_modal_dialog;
 }
 
@@ -99,6 +112,16 @@ void AppModalDialog::CreateAndShowDialog() {
       NOTREACHED();
   }
 
+  // We want the alert to be app modal so put all the browser windows into the
+  // same window group.
+  GtkWindowGroup* window_group = gtk_window_group_new();
+  for (BrowserList::const_iterator it = BrowserList::begin();
+       it != BrowserList::end(); ++it) {
+    BrowserWindowGtk* window = static_cast<BrowserWindowGtk*>((*it)->window());
+    gtk_window_group_add_window(window_group, window->window());
+  }
+  g_object_unref(window_group);
+
   GtkWindow* window = tab_contents_->view()->GetTopLevelNativeWindow();
   dialog_ = gtk_message_dialog_new(window, GTK_DIALOG_MODAL,
       message_type, buttons, "%s", WideToUTF8(message_text_).c_str());
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 352c737..d4e2e00 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -21,6 +21,7 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ -978,6 +979,13 @@ void BrowserWindowGtk::Observe(NotificationType type,
       if (!window_)
         break;
 
+      // If there's an app modal dialog (e.g., JS alert), try to redirect
+      // the user's attention to the window owning the dialog.
+      if (Singleton<AppModalDialogQueue>()->HasActiveDialog()) {
+        Singleton<AppModalDialogQueue>()->ActivateModalDialog();
+        break;
+      }
+
       // If we lose focus to an info bubble, we don't want to seem inactive.
       // However we can only control this when we are painting a custom
       // frame. So if we lose focus BUT it's to one of our info bubbles AND we
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 92a1cf3..4552575 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -162,7 +162,7 @@ class BrowserWindowGtk : public BrowserWindow,
     return browser_.get();
   }
 
-  GtkWindow* window() { return window_; }
+  GtkWindow* window() const { return window_; }
 
   static void RegisterUserPrefs(PrefService* prefs);