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.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.h')
| -rw-r--r-- | chrome/browser/browser.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 945a677..e7123c8 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -624,6 +624,7 @@ class Browser : public TabStripModelDelegate, bool* is_keyboard_shortcut); virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); + virtual void ShowContentSettingsWindow(ContentSettingsType content_type); virtual bool ShouldAddNavigationsToHistory() const; virtual void OnDidGetApplicationInfo(TabContents* tab_contents, int32 page_id); |