Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Unified Diff: views/controls/menu/menu_2.h

Issue 149635: Attempt fixing a crash. Looks like NativeMenuWin was getting leaked by Menu2.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_2.h
===================================================================
--- views/controls/menu/menu_2.h (revision 20686)
+++ views/controls/menu/menu_2.h (working copy)
@@ -6,7 +6,9 @@
#define CONTROLS_MENU_VIEWS_MENU_2_H_
#include "base/gfx/native_widget_types.h"
+#include "base/scoped_ptr.h"
#include "base/string16.h"
+#include "views/controls/menu/menu_wrapper.h"
namespace gfx {
class Point;
@@ -17,7 +19,6 @@
class Accelerator;
class Menu2;
-class MenuWrapper;
// The Menu2Model is an interface implemented by an object that provides the
// content of a menu.
@@ -142,7 +143,7 @@
Menu2Model* model_;
// The object that actually implements the menu.
- MenuWrapper* wrapper_;
+ scoped_ptr<MenuWrapper> wrapper_;
DISALLOW_COPY_AND_ASSIGN(Menu2);
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698