Make the content settings dialog dependent on its parent. This re-plumbs the "show" function to work more like a number of our other dialogs (i.e. delcared in browser_dialogs.h), and adds a TabContentsDelegate function so the content blocked info bubbles can ask the appropriate window to show the dialog.

BUG=35084
TEST=Open the content settings dialog from either the options or a content blocked info bubble. Click its parent window.  The dialog should stay on top of the parent.
Review URL: http://codereview.chromium.org/597009

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

2 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index c3bf87b..267f93d 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -871,6 +871,12 @@ void BrowserWindowGtk::ShowRepostFormWarningDialog(
   new RepostFormWarningGtk(GetNativeHandle(), &tab_contents->controller());
 }
 
+void BrowserWindowGtk::ShowContentSettingsWindow(
+    ContentSettingsType content_type,
+    Profile* profile) {
+  NOTIMPLEMENTED();
+}
+
 void BrowserWindowGtk::ShowProfileErrorDialog(int message_id) {
   std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
   std::string message = l10n_util::GetStringUTF8(message_id);
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 711c535..0cf15a6 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -96,6 +96,8 @@ class BrowserWindowGtk : public BrowserWindow,
   virtual void ShowSelectProfileDialog();
   virtual void ShowNewProfileDialog();
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
+  virtual void ShowContentSettingsWindow(ContentSettingsType content_type,
+                                         Profile* profile);
   virtual void ShowProfileErrorDialog(int message_id);
   virtual void ShowThemeInstallBubble();
   virtual void ConfirmBrowserCloseWithPendingDownloads();