diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 23:22:20 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 23:22:20 +0000 |
commit | 6354314433a94aa6656499d79ff17f220220ab0f (patch) | |
tree | 74dc4cd4bd7b88a9833e7125b545ba2287ee9e92 /chrome/browser/browser_window.h | |
parent | 6a760c99f8a9590f8643a832d50980c60c5c3931 (diff) | |
download | chromium_src-6354314433a94aa6656499d79ff17f220220ab0f.zip chromium_src-6354314433a94aa6656499d79ff17f220220ab0f.tar.gz chromium_src-6354314433a94aa6656499d79ff17f220220ab0f.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/browser_window.h')
-rw-r--r-- | chrome/browser/browser_window.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/browser_window.h b/chrome/browser/browser_window.h index a5dae90..ab38295 100644 --- a/chrome/browser/browser_window.h +++ b/chrome/browser/browser_window.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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. @@ -7,6 +7,7 @@ #include "app/gfx/native_widget_types.h" #include "chrome/browser/tab_contents/navigation_entry.h" +#include "chrome/common/content_settings_types.h" class Browser; class BrowserWindowTesting; @@ -211,6 +212,10 @@ class BrowserWindow { // Shows the repost form confirmation dialog box. virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) = 0; + // Shows the Content Settings dialog box. + virtual void ShowContentSettingsWindow(ContentSettingsType content_type, + Profile* profile) = 0; + // Shows a dialog to the user that something is wrong with the profile. // |message_id| is the ID for a string in the string table which will be // displayed in the dialog. |