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

Side by Side 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: fixor Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 scoped_ptr<MenuScrollTask> scroll_task_; 518 scoped_ptr<MenuScrollTask> scroll_task_;
519 519
520 MenuButton* menu_button_; 520 MenuButton* menu_button_;
521 521
522 // If non-null mouse drag events are forwarded to this view. See 522 // If non-null mouse drag events are forwarded to this view. See
523 // UpdateActiveMouseView for details. 523 // UpdateActiveMouseView for details.
524 View* active_mouse_view_; 524 View* active_mouse_view_;
525 525
526 internal::MenuControllerDelegate* delegate_; 526 internal::MenuControllerDelegate* delegate_;
527 527
528 // How deep we are in nested message loops. This should be at most 2 (when
529 // showing a context menu from a menu).
530 int message_loop_depth_;
531
528 DISALLOW_COPY_AND_ASSIGN(MenuController); 532 DISALLOW_COPY_AND_ASSIGN(MenuController);
529 }; 533 };
530 534
531 } // namespace views 535 } // namespace views
532 536
533 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 537 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698