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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 should_perform_default = false; | 76 should_perform_default = false; |
77 break; | 77 break; |
78 default: | 78 default: |
79 break; | 79 break; |
80 } | 80 } |
81 } | 81 } |
82 | 82 |
83 if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE) | 83 if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE) |
84 menu_controller_->TerminateNestedMessageLoop(); | 84 menu_controller_->TerminateNestedMessageLoop(); |
85 | 85 |
86 return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT | 86 return should_perform_default ? ui::kPostDispatchPerformDefault |
87 : ui::POST_DISPATCH_NONE; | 87 : ui::kPostDispatchNone; |
88 } | 88 } |
89 | 89 |
90 } // namespace internal | 90 } // namespace internal |
91 } // namespace views | 91 } // namespace views |
OLD | NEW |