diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 17:58:32 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 17:58:32 +0000 |
| commit | 8c1ae5ec4d47638315096f54819793484383c91f (patch) | |
| tree | c7749cae01663511be911c22e3928f7ef5aa8aab /chrome/browser/views | |
| parent | e90eca1550812bb5694c9523ffc75963c845d46d (diff) | |
| download | chromium_src-8c1ae5ec4d47638315096f54819793484383c91f.zip chromium_src-8c1ae5ec4d47638315096f54819793484383c91f.tar.gz chromium_src-8c1ae5ec4d47638315096f54819793484383c91f.tar.bz2 | |
Pass in the HostContentSettingsMap to the CookieModalDialog so IsValid can make its decision. Before, it used the TabContents to get the profile to get the map, but this was incorrect because the current tab isn't necessarily from the same profile as the original request.
As long as we have the HostContentSettingsMap, we might as well handle "remember" in CookieModalDialog.
This bug exists in 4.1.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/651023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/cookie_prompt_view.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/views/cookie_prompt_view.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc index 1870b23..2c01525 100644 --- a/chrome/browser/views/cookie_prompt_view.cc +++ b/chrome/browser/views/cookie_prompt_view.cc @@ -59,7 +59,6 @@ CookiePromptView::CookiePromptView( } CookiePromptView::~CookiePromptView() { - delete parent_; } /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/cookie_prompt_view.h b/chrome/browser/views/cookie_prompt_view.h index 8f588e5..101895e 100644 --- a/chrome/browser/views/cookie_prompt_view.h +++ b/chrome/browser/views/cookie_prompt_view.h @@ -109,7 +109,7 @@ class CookiePromptView : public views::View, std::wstring title_; // A pointer to the AppModalDialog that created us. We own this. - CookiePromptModalDialog* parent_; + scoped_ptr<CookiePromptModalDialog> parent_; gfx::NativeWindow root_window_; |