Merge 20692 - Attempt fixing a crash. Looks like NativeMenuWin was getting le...

Merge 20692 - Attempt fixing a crash. Looks like NativeMenuWin was getting leaked by Menu2... meaning a NativeMenuWin could outlive its model potentially!

http://crbug.com/14594
TEST=none

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

TBR=ben@chromium.org


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

[Ben Goodger (Google), 2009-07-15 01:07:23]

OK

On Tue, Jul 14, 2009 at 5:52 PM, <laforge@chromium.org> wrote:
> Reviewers: Ben Goodger,
>
> Description:
> Merge 20692 - Attempt fixing a crash. Looks like NativeMenuWin was
> getting leaked by Menu2... meaning a NativeMenuWin could outlive its
> model potentially!
>
> http://crbug.com/14594
> TEST=3Dnone
>
> Review URL: http://codereview.chromium.org/149635
>
> TBR=3Dben@chromium.org
>
>
> Please review this at http://codereview.chromium.org/155549
>
> SVN Base: svn://chrome-svn/chrome/branches/193/src/
>
> Affected files:
> =A0MM =A0 =A0views/controls/menu/menu_2.h
>
>
> Index: views/controls/menu/menu_2.h
> =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
> --- views/controls/menu/menu_2.h =A0 =A0 =A0 =A0(revision 20695)
> +++ views/controls/menu/menu_2.h =A0 =A0 =A0 =A0(working copy)
> @@ -6,7 +6,9 @@
> =A0#define CONTROLS_MENU_VIEWS_MENU_2_H_
>
> =A0#include "base/gfx/native_widget_types.h"
> +#include "base/scoped_ptr.h"
> =A0#include "base/string16.h"
> +#include "views/controls/menu/menu_wrapper.h"
>
> =A0namespace gfx {
> =A0class Point;
> @@ -17,7 +19,6 @@
>
> =A0class Accelerator;
> =A0class Menu2;
> -class MenuWrapper;
>
> =A0// The Menu2Model is an interface implemented by an object that provid=
es
> the
> =A0// content of a menu.
> @@ -142,7 +143,7 @@
> =A0 Menu2Model* model_;
>
> =A0 // The object that actually implements the menu.
> - =A0MenuWrapper* wrapper_;
> + =A0scoped_ptr<MenuWrapper> wrapper_;
>
> =A0 DISALLOW_COPY_AND_ASSIGN(Menu2);
> =A0};
>
> Property changes on: views\controls\menu\menu_2.h
> ___________________________________________________________________
> Added: svn:mergeinfo
> =A0 Merged
> /branches/chrome_webkit_merge_branch/views/controls/menu/menu_2.h:r69-277=
5
> =A0 Merged /trunk/src/views/controls/menu/menu_2.h:r20692
>
>
>
>