| 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/screen_position_client.h" | 10 #include "ui/aura/client/screen_position_client.h" |
| 11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_event_dispatcher.h" | 12 #include "ui/aura/window_event_dispatcher.h" |
| 13 #include "ui/aura/window_tree_host.h" | 13 #include "ui/aura/window_tree_host.h" |
| 14 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
| 15 #include "ui/events/platform/platform_event_source.h" | 15 #include "ui/events/platform/platform_event_source.h" |
| 16 #include "ui/events/platform/scoped_event_dispatcher.h" | 16 #include "ui/events/platform/scoped_event_dispatcher.h" |
| 17 #include "ui/views/controls/menu/menu_controller.h" | 17 #include "ui/views/controls/menu/menu_controller.h" |
| 18 #include "ui/views/controls/menu/menu_key_event_handler.h" | 18 #include "ui/views/controls/menu/menu_key_event_handler.h" |
| 19 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
| 20 #include "ui/wm/public/activation_change_observer.h" | 20 #include "ui/wm/public/activation_change_observer.h" |
| 21 #include "ui/wm/public/activation_client.h" | 21 #include "ui/wm/public/activation_client.h" |
| 22 #include "ui/wm/public/dispatcher_client.h" | |
| 23 #include "ui/wm/public/drag_drop_client.h" | 22 #include "ui/wm/public/drag_drop_client.h" |
| 24 | 23 |
| 25 | 24 |
| 26 using aura::client::ScreenPositionClient; | 25 using aura::client::ScreenPositionClient; |
| 27 | 26 |
| 28 namespace views { | 27 namespace views { |
| 29 | 28 |
| 30 namespace { | 29 namespace { |
| 31 | 30 |
| 32 aura::Window* GetOwnerRootWindow(views::Widget* owner) { | 31 aura::Window* GetOwnerRootWindow(views::Widget* owner) { |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 if (ui::PlatformEventSource::GetInstance()) | 163 if (ui::PlatformEventSource::GetInstance()) |
| 165 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); | 164 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); |
| 166 #endif | 165 #endif |
| 167 } | 166 } |
| 168 | 167 |
| 169 void MenuMessageLoopAura::ClearOwner() { | 168 void MenuMessageLoopAura::ClearOwner() { |
| 170 owner_ = NULL; | 169 owner_ = NULL; |
| 171 } | 170 } |
| 172 | 171 |
| 173 } // namespace views | 172 } // namespace views |
| OLD | NEW |