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

Unified Diff: ui/views/controls/menu/menu_controller.h

Issue 10154013: Fixes crash in closing menus. There are two issues here: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: OnOwnerClosing and more comments Created 8 years, 8 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
Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index 4376b7581a5dadd6eb09dfd07dea1ba7f155279e..8f3f054283c2222908cf43e5675890ba7843e911 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -525,6 +525,10 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {
internal::MenuControllerDelegate* delegate_;
+ // How deep we are in nested message loops. This should be at most 2 (when
+ // showing a context menu from a menu).
+ int message_loop_depth_;
+
DISALLOW_COPY_AND_ASSIGN(MenuController);
};

Powered by Google App Engine
This is Rietveld 408576698