diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 15:38:57 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 15:38:57 +0000 |
| commit | 7a23d81958a00cbfd11ca17d6cc17abe20950364 (patch) | |
| tree | 7b6ac8ad0f3524fcb03e2c69e692a8b758b28cf6 /chrome/test/gpu | |
| parent | 0a9ae818d22d4f5630f94e2d10a724dc625d2f8d (diff) | |
| download | chromium_src-7a23d81958a00cbfd11ca17d6cc17abe20950364.zip chromium_src-7a23d81958a00cbfd11ca17d6cc17abe20950364.tar.gz chromium_src-7a23d81958a00cbfd11ca17d6cc17abe20950364.tar.bz2 | |
Revert 238283 "Infobar system refactor."
Crashes on android
BUG=325216
> Infobar system refactor.
>
> This changes the ownership model of infobars so that InfoBars are long-lived and
> own their InfoBarDelegates directly. The InfoBarService pseudo-owns the
> InfoBars (instead of deleting them directly, it tells them when they're unowned
> and expects them to delete themselves).
>
> This fixes leaks when infobars are closed while not visible (e.g. in a
> background tab) and in general makes the system clearer and easier to reason
> about.
>
> BUG=62154
> TEST=none
> R=erg@chromium.org, sail@chromium.org, sky@chromium.org
>
> Review URL: https://codereview.chromium.org/22694006
TBR=pkasting@chromium.org
Review URL: https://codereview.chromium.org/102163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/webgl_infobar_browsertest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index 086ea16..ab362eb 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -7,7 +7,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" -#include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -142,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, MAYBE_ContextLossInfoBarReload) { InfoBarService* infobar_service = InfoBarService::FromWebContents( browser()->tab_strip_model()->GetActiveWebContents()); ASSERT_EQ(1u, infobar_service->infobar_count()); - InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate(); + InfoBarDelegate* delegate = infobar_service->infobar_at(0); ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate()); delegate->AsConfirmInfoBarDelegate()->Cancel(); |