Merge 21445 - Close pop up notification when navigating to other site....

Merge 21445 - Close pop up notification when navigating to other site.

When BlockedPopupContainer stopped being a ConstrainedWindow, the
notification stopped being cleared in TabContents::MaybeCloseChildWindows.

http://crbug.com/8622
http://crbug.com/14150
TEST=See 8622 for repro steps.

Review URL: http://codereview.chromium.org/159287

TBR=erg@google.com


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=21733

[erg, 2009-07-27 23:00:07]

Horray! LGTM.

On Mon, Jul 27, 2009 at 3:58 PM, <laforge@chromium.org> wrote:
> Reviewers: erg,
>
> Description:
> Merge 21445 - Close pop up notification when navigating to other site.
>
> When BlockedPopupContainer stopped being a ConstrainedWindow, the
> notification stopped being cleared in
> TabContents::MaybeCloseChildWindows.
>
> http://crbug.com/8622
> http://crbug.com/14150
> TEST=3DSee 8622 for repro steps.
>
> Review URL: http://codereview.chromium.org/159287
>
> TBR=3Derg@google.com
>
>
> Please review this at http://codereview.chromium.org/159445
>
> SVN Base: svn://chrome-svn/chrome/branches/195/src/
>
> Affected files:
> =A0MM =A0 =A0chrome/browser/tab_contents/tab_contents.cc
>
>
> Index: chrome/browser/tab_contents/tab_contents.cc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- chrome/browser/tab_contents/tab_contents.cc (revision 21732)
> +++ chrome/browser/tab_contents/tab_contents.cc (working copy)
> @@ -1264,6 +1264,12 @@
> =A0 =A0 if (window)
> =A0 =A0 =A0 window->CloseConstrainedWindow();
> =A0 }
> +
> + =A0// Close the popup container.
> + =A0if (blocked_popups_) {
> + =A0 =A0blocked_popups_->Destroy();
> + =A0 =A0blocked_popups_ =3D NULL;
> + =A0}
> =A0}
>
> =A0void TabContents::UpdateStarredStateForCurrentURL() {
>
> Property changes on: chrome\browser\tab_contents\tab_contents.cc
> ___________________________________________________________________
> Modified: svn:mergeinfo
> =A0 Merged /trunk/src/chrome/browser/tab_contents/tab_contents.cc:r21445
>
>
>
>