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_controller.h" | 5 #include "ui/views/controls/menu/menu_controller.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" |
10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "ui/aura/scoped_window_targeter.h" | 15 #include "ui/aura/scoped_window_targeter.h" |
15 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
16 #include "ui/events/event.h" | 17 #include "ui/events/event.h" |
17 #include "ui/events/event_constants.h" | 18 #include "ui/events/event_constants.h" |
18 #include "ui/events/event_handler.h" | 19 #include "ui/events/event_handler.h" |
19 #include "ui/events/event_utils.h" | 20 #include "ui/events/event_utils.h" |
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1413 // crash. | 1414 // crash. |
1414 TestAsyncEscapeKey(); | 1415 TestAsyncEscapeKey(); |
1415 EXPECT_EQ(nested_controller_delegate_2->on_menu_closed_called(), 1); | 1416 EXPECT_EQ(nested_controller_delegate_2->on_menu_closed_called(), 1); |
1416 EXPECT_EQ(menu_controller_delegate(), GetCurrentDelegate()); | 1417 EXPECT_EQ(menu_controller_delegate(), GetCurrentDelegate()); |
1417 } | 1418 } |
1418 | 1419 |
1419 #endif // defined(USE_AURA) | 1420 #endif // defined(USE_AURA) |
1420 | 1421 |
1421 } // namespace test | 1422 } // namespace test |
1422 } // namespace views | 1423 } // namespace views |
OLD | NEW |