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

Side by Side Diff: ui/views/controls/menu/menu_controller.h

Issue 2687753002: Revert MenuController Checks (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <list> 10 #include <list>
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 567
568 // If true, Run blocks. If false, Run doesn't block and this is used for 568 // If true, Run blocks. If false, Run doesn't block and this is used for
569 // drag and drop. Note that the semantics for drag and drop are slightly 569 // drag and drop. Note that the semantics for drag and drop are slightly
570 // different: cancel timer is kicked off any time the drag moves outside the 570 // different: cancel timer is kicked off any time the drag moves outside the
571 // menu, mouse events do nothing... 571 // menu, mouse events do nothing...
572 bool blocking_run_; 572 bool blocking_run_;
573 573
574 // If true, we're showing. 574 // If true, we're showing.
575 bool showing_; 575 bool showing_;
576 576
577 // TODO(jonross): remove after tracking down the cause of (crbug.com/683087).
578 // If true running has began and there are still delegates which have not been
579 // closed. We may not be showing.
580 bool running_;
581
582 // Indicates what to exit. 577 // Indicates what to exit.
583 ExitType exit_type_; 578 ExitType exit_type_;
584 579
585 // Whether we did a capture. We do a capture only if we're blocking and 580 // Whether we did a capture. We do a capture only if we're blocking and
586 // the mouse was down when Run. 581 // the mouse was down when Run.
587 bool did_capture_; 582 bool did_capture_;
588 583
589 // As the user drags the mouse around pending_state_ changes immediately. 584 // As the user drags the mouse around pending_state_ changes immediately.
590 // When the user stops moving/dragging the mouse (or clicks the mouse) 585 // When the user stops moving/dragging the mouse (or clicks the mouse)
591 // pending_state_ is committed to state_, potentially resulting in 586 // pending_state_ is committed to state_, potentially resulting in
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 #if defined(USE_AURA) 705 #if defined(USE_AURA)
711 std::unique_ptr<MenuPreTargetHandler> menu_pre_target_handler_; 706 std::unique_ptr<MenuPreTargetHandler> menu_pre_target_handler_;
712 #endif 707 #endif
713 708
714 DISALLOW_COPY_AND_ASSIGN(MenuController); 709 DISALLOW_COPY_AND_ASSIGN(MenuController);
715 }; 710 };
716 711
717 } // namespace views 712 } // namespace views
718 713
719 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 714 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698