OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "ui/views/controls/menu/menu_event_dispatcher_linux.h" | 5 #include "ui/views/controls/menu/menu_event_dispatcher_linux.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
9 #include "ui/events/event_utils.h" | 9 #include "ui/events/event_utils.h" |
10 #include "ui/events/keycodes/keyboard_code_conversion.h" | 10 #include "ui/events/keycodes/keyboard_code_conversion.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 } | 68 } |
69 } | 69 } |
70 should_quit = false; | 70 should_quit = false; |
71 should_perform_default = false; | 71 should_perform_default = false; |
72 break; | 72 break; |
73 } | 73 } |
74 case ui::ET_KEY_RELEASED: | 74 case ui::ET_KEY_RELEASED: |
75 should_quit = false; | 75 should_quit = false; |
76 should_perform_default = false; | 76 should_perform_default = false; |
77 break; | 77 break; |
| 78 case ui::ET_TOUCH_RELEASED: |
| 79 case ui::ET_TOUCH_CANCELLED: |
| 80 // Don't allow the event copy to clear the native touch id |
| 81 // mapping, or we'll lose the mapping before the initial event |
| 82 // has finished being dispatched. |
| 83 static_cast<ui::TouchEvent*>(ui_event.get()) |
| 84 ->set_should_remove_native_touch_id_mapping(false); |
| 85 break; |
78 default: | 86 default: |
79 break; | 87 break; |
80 } | 88 } |
81 } | 89 } |
82 | 90 |
83 if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE) | 91 if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE) |
84 menu_controller_->TerminateNestedMessageLoop(); | 92 menu_controller_->TerminateNestedMessageLoop(); |
85 | 93 |
86 return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT | 94 return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT |
87 : ui::POST_DISPATCH_NONE; | 95 : ui::POST_DISPATCH_NONE; |
88 } | 96 } |
89 | 97 |
90 } // namespace internal | 98 } // namespace internal |
91 } // namespace views | 99 } // namespace views |
OLD | NEW |