| Index: ui/views/controls/menu/native_menu_win.h
|
| diff --git a/ui/views/controls/menu/native_menu_win.h b/ui/views/controls/menu/native_menu_win.h
|
| index 7d4dea9a3dcea78bf3117ca93fdfa96f249cec49..3cbc25f8cd918740dfdc3c209b3f6490256d87dd 100644
|
| --- a/ui/views/controls/menu/native_menu_win.h
|
| +++ b/ui/views/controls/menu/native_menu_win.h
|
| @@ -146,7 +146,6 @@ class VIEWS_EXPORT NativeMenuWin : public MenuWrapper {
|
| // See comment in MenuMessageHook for details on these.
|
| NativeMenuWin* menu_to_select_;
|
| int position_to_select_;
|
| - base::WeakPtrFactory<NativeMenuWin> menu_to_select_factory_;
|
|
|
| // If we're a submenu, this is our parent.
|
| NativeMenuWin* parent_;
|
| @@ -156,6 +155,8 @@ class VIEWS_EXPORT NativeMenuWin : public MenuWrapper {
|
| // running.
|
| bool* destroyed_flag_;
|
|
|
| + base::WeakPtrFactory<NativeMenuWin> menu_to_select_factory_;
|
| +
|
| // Ugly: a static pointer to the instance of this class that currently
|
| // has a menu open, because our hook function that receives keyboard
|
| // events doesn't have a mechanism to get a user data pointer.
|
|
|