GTK: Put options dialogs in a different window group.

chrome/browser/gtk/options/fonts_languages_window_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/fonts_languages_window.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/gtk/options/fonts_page_gtk.h"
 #include "chrome/browser/gtk/options/languages_page_gtk.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // FontsLanguagesWindowGtk
 //
 // The contents of the Options dialog window.
 
 class FontsLanguagesWindowGtk {
  public:
   explicit FontsLanguagesWindowGtk(Profile* profile);
   ~FontsLanguagesWindowGtk();
 
   // Shows the tab corresponding to the specified |page|.
-  void ShowTabPage(FontsLanguagesPage page);
+  void ShowTabPage(gfx::NativeWindow window, FontsLanguagesPage page);
 
  private:
   static void OnWindowDestroy(GtkWidget* widget,
                               FontsLanguagesWindowGtk* window);
 
   // The fonts and languages dialog.
   GtkWidget *dialog_;
 
   // The container of the option pages.
   GtkWidget *notebook_;
@@ skipping 63 matching lines @@
   // directly to gtk_widget_destroy.
   g_signal_connect_swapped(dialog_, "response", G_CALLBACK(gtk_widget_destroy),
                            dialog_);
 
   g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroy), this);
 }
 
 FontsLanguagesWindowGtk::~FontsLanguagesWindowGtk() {
 }
 
-void FontsLanguagesWindowGtk::ShowTabPage(FontsLanguagesPage page) {
+void FontsLanguagesWindowGtk::ShowTabPage(gfx::NativeWindow window,
+                                          FontsLanguagesPage page) {
+  // Center our dialog over whoever displayed us.
+  gtk_util::CenterOverWindow(GTK_WINDOW(dialog_), window);
+
   // Bring options window to front if it already existed and isn't already
   // in front.
   gtk_window_present(GTK_WINDOW(dialog_));
 
   // If the page is out of bounds, reset to the first tab.
   if (page < 0 || page >= gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook_)))
     page = FONTS_ENCODING_PAGE;
 
   // Switch the tab to the selected |page|.
   gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), page);
@@ skipping 11 matching lines @@
 
 void ShowFontsLanguagesWindow(gfx::NativeWindow window,
                               FontsLanguagesPage page,
                               Profile* profile) {
   DCHECK(profile);
   // If there's already an existing fonts and language window, activate it and
   // switch to the specified page.
   if (!instance_)
     instance_ = new FontsLanguagesWindowGtk(profile);
 
-  instance_->ShowTabPage(page);
+  instance_->ShowTabPage(window, page);
 }