| OLD | NEW |
| 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 Loading... |
| 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 |
| 577 // Indicates what to exit. | 582 // Indicates what to exit. |
| 578 ExitType exit_type_; | 583 ExitType exit_type_; |
| 579 | 584 |
| 580 // Whether we did a capture. We do a capture only if we're blocking and | 585 // Whether we did a capture. We do a capture only if we're blocking and |
| 581 // the mouse was down when Run. | 586 // the mouse was down when Run. |
| 582 bool did_capture_; | 587 bool did_capture_; |
| 583 | 588 |
| 584 // As the user drags the mouse around pending_state_ changes immediately. | 589 // As the user drags the mouse around pending_state_ changes immediately. |
| 585 // When the user stops moving/dragging the mouse (or clicks the mouse) | 590 // When the user stops moving/dragging the mouse (or clicks the mouse) |
| 586 // pending_state_ is committed to state_, potentially resulting in | 591 // pending_state_ is committed to state_, potentially resulting in |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 #if defined(USE_AURA) | 710 #if defined(USE_AURA) |
| 706 std::unique_ptr<MenuPreTargetHandler> menu_pre_target_handler_; | 711 std::unique_ptr<MenuPreTargetHandler> menu_pre_target_handler_; |
| 707 #endif | 712 #endif |
| 708 | 713 |
| 709 DISALLOW_COPY_AND_ASSIGN(MenuController); | 714 DISALLOW_COPY_AND_ASSIGN(MenuController); |
| 710 }; | 715 }; |
| 711 | 716 |
| 712 } // namespace views | 717 } // namespace views |
| 713 | 718 |
| 714 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ | 719 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ |
| OLD | NEW |