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

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index e573f2d..24186b3 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -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.
 
@@ -317,6 +317,12 @@ void BrowserWindowCocoa::ShowRepostFormWarningDialog(
   new RepostFormWarningMac(GetNativeHandle(), &tab_contents->controller());
 }
 
+void BrowserWindowCocoa::ShowContentSettingsWindow(
+    ContentSettingsType content_type,
+    Profile* profile) {
+  NOTIMPLEMENTED();
+}
+
 void BrowserWindowCocoa::ShowProfileErrorDialog(int message_id) {
   scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]);
   [alert addButtonWithTitle:l10n_util::GetNSStringWithFixup(IDS_OK)];