| 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_message_loop_aura.h" | 5 #include "ui/views/controls/menu/menu_message_loop_aura.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "ui/aura/client/drag_drop_client.h" |
| 10 #include "ui/aura/client/screen_position_client.h" | 11 #include "ui/aura/client/screen_position_client.h" |
| 11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_event_dispatcher.h" | 13 #include "ui/aura/window_event_dispatcher.h" |
| 13 #include "ui/aura/window_tree_host.h" | 14 #include "ui/aura/window_tree_host.h" |
| 14 #include "ui/events/event.h" | 15 #include "ui/events/event.h" |
| 15 #include "ui/events/platform/platform_event_source.h" | 16 #include "ui/events/platform/platform_event_source.h" |
| 16 #include "ui/events/platform/scoped_event_dispatcher.h" | 17 #include "ui/events/platform/scoped_event_dispatcher.h" |
| 17 #include "ui/views/controls/menu/menu_controller.h" | 18 #include "ui/views/controls/menu/menu_controller.h" |
| 18 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
| 19 #include "ui/wm/public/activation_change_observer.h" | 20 #include "ui/wm/public/activation_change_observer.h" |
| 20 #include "ui/wm/public/activation_client.h" | 21 #include "ui/wm/public/activation_client.h" |
| 21 #include "ui/wm/public/drag_drop_client.h" | |
| 22 | 22 |
| 23 | 23 |
| 24 using aura::client::ScreenPositionClient; | 24 using aura::client::ScreenPositionClient; |
| 25 | 25 |
| 26 namespace views { | 26 namespace views { |
| 27 | 27 |
| 28 // static | 28 // static |
| 29 MenuMessageLoop* MenuMessageLoop::Create() { | 29 MenuMessageLoop* MenuMessageLoop::Create() { |
| 30 return new MenuMessageLoopAura; | 30 return new MenuMessageLoopAura; |
| 31 } | 31 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 78 |
| 79 #if !defined(OS_WIN) | 79 #if !defined(OS_WIN) |
| 80 // Ask PlatformEventSource to stop dispatching events in this message loop | 80 // Ask PlatformEventSource to stop dispatching events in this message loop |
| 81 // iteration. We want our menu's loop to return before the next event. | 81 // iteration. We want our menu's loop to return before the next event. |
| 82 if (ui::PlatformEventSource::GetInstance()) | 82 if (ui::PlatformEventSource::GetInstance()) |
| 83 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); | 83 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); |
| 84 #endif | 84 #endif |
| 85 } | 85 } |
| 86 | 86 |
| 87 } // namespace views | 87 } // namespace views |
| OLD | NEW |