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 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windowsx.h> | 8 #include <windowsx.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "ui/aura/client/screen_position_client.h" | 12 #include "ui/aura/client/screen_position_client.h" |
13 #include "ui/aura/env.h" | |
14 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
15 #include "ui/aura/window_event_dispatcher.h" | 14 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/aura/window_tree_host.h" | 15 #include "ui/aura/window_tree_host.h" |
17 #include "ui/events/event.h" | 16 #include "ui/events/event.h" |
18 #include "ui/events/platform/platform_event_source.h" | 17 #include "ui/events/platform/platform_event_source.h" |
19 #include "ui/events/platform/scoped_event_dispatcher.h" | 18 #include "ui/events/platform/scoped_event_dispatcher.h" |
20 #include "ui/views/controls/menu/menu_controller.h" | 19 #include "ui/views/controls/menu/menu_controller.h" |
20 #include "ui/views/controls/menu/menu_event_handler.h" | |
sky
2015/09/09 15:44:52
Shouldn't this be in the not win section below? Sa
afakhry
2015/09/09 20:21:33
Done.
| |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 #include "ui/wm/public/activation_change_observer.h" | 22 #include "ui/wm/public/activation_change_observer.h" |
23 #include "ui/wm/public/activation_client.h" | 23 #include "ui/wm/public/activation_client.h" |
24 #include "ui/wm/public/dispatcher_client.h" | 24 #include "ui/wm/public/dispatcher_client.h" |
25 #include "ui/wm/public/drag_drop_client.h" | 25 #include "ui/wm/public/drag_drop_client.h" |
26 | 26 |
27 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
28 #include "ui/base/win/internal_constants.h" | 28 #include "ui/base/win/internal_constants.h" |
29 #include "ui/views/controls/menu/menu_message_pump_dispatcher_win.h" | 29 #include "ui/views/controls/menu/menu_message_pump_dispatcher_win.h" |
30 #include "ui/views/win/hwnd_util.h" | 30 #include "ui/views/win/hwnd_util.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
96 DISALLOW_COPY_AND_ASSIGN(ActivationChangeObserverImpl); | 96 DISALLOW_COPY_AND_ASSIGN(ActivationChangeObserverImpl); |
97 }; | 97 }; |
98 | 98 |
99 } // namespace | 99 } // namespace |
100 | 100 |
101 // static | 101 // static |
102 MenuMessageLoop* MenuMessageLoop::Create() { | 102 MenuMessageLoop* MenuMessageLoop::Create() { |
103 return new MenuMessageLoopAura; | 103 return new MenuMessageLoopAura; |
104 } | 104 } |
105 | 105 |
106 MenuMessageLoopAura::MenuMessageLoopAura() : owner_(NULL) { | 106 MenuMessageLoopAura::MenuMessageLoopAura() : owner_(nullptr) { |
107 } | 107 } |
108 | 108 |
109 MenuMessageLoopAura::~MenuMessageLoopAura() { | 109 MenuMessageLoopAura::~MenuMessageLoopAura() { |
110 } | 110 } |
111 | 111 |
112 void MenuMessageLoopAura::RepostEventToWindow(const ui::LocatedEvent& event, | 112 void MenuMessageLoopAura::RepostEventToWindow(const ui::LocatedEvent& event, |
113 gfx::NativeWindow window, | 113 gfx::NativeWindow window, |
114 const gfx::Point& screen_loc) { | 114 const gfx::Point& screen_loc) { |
115 aura::Window* root = window->GetRootWindow(); | 115 aura::Window* root = window->GetRootWindow(); |
116 ScreenPositionClient* spc = aura::client::GetScreenPositionClient(root); | 116 ScreenPositionClient* spc = aura::client::GetScreenPositionClient(root); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
150 message_loop_quit_ = run_loop.QuitClosure(); | 150 message_loop_quit_ = run_loop.QuitClosure(); |
151 run_loop.Run(); | 151 run_loop.Run(); |
152 } else { | 152 } else { |
153 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | 153 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); |
154 base::MessageLoop::ScopedNestableTaskAllower allow(loop); | 154 base::MessageLoop::ScopedNestableTaskAllower allow(loop); |
155 base::RunLoop run_loop(&nested_dispatcher); | 155 base::RunLoop run_loop(&nested_dispatcher); |
156 message_loop_quit_ = run_loop.QuitClosure(); | 156 message_loop_quit_ = run_loop.QuitClosure(); |
157 run_loop.Run(); | 157 run_loop.Run(); |
158 } | 158 } |
159 #else | 159 #else |
160 internal::MenuEventDispatcher event_dispatcher(controller); | 160 scoped_ptr<ActivationChangeObserverImpl> observer; |
161 scoped_ptr<ui::ScopedEventDispatcher> dispatcher_override; | |
162 if (ui::PlatformEventSource::GetInstance()) { | |
163 dispatcher_override = | |
164 ui::PlatformEventSource::GetInstance()->OverrideDispatcher( | |
165 &event_dispatcher); | |
166 } | |
167 if (root) { | 161 if (root) { |
168 scoped_ptr<ActivationChangeObserverImpl> observer; | |
169 if (!nested_menu) | 162 if (!nested_menu) |
170 observer.reset(new ActivationChangeObserverImpl(controller, root)); | 163 observer.reset(new ActivationChangeObserverImpl(controller, root)); |
171 aura::client::DispatcherRunLoop run_loop( | |
172 aura::client::GetDispatcherClient(root), NULL); | |
173 message_loop_quit_ = run_loop.QuitClosure(); | |
174 run_loop.Run(); | |
175 } else { | |
176 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | |
177 base::MessageLoop::ScopedNestableTaskAllower allow(loop); | |
178 base::RunLoop run_loop; | |
179 message_loop_quit_ = run_loop.QuitClosure(); | |
180 run_loop.Run(); | |
181 } | 164 } |
182 #endif | 165 |
166 scoped_ptr<MenuEventHandler> menu_event_filter; | |
167 if (!nested_menu) { | |
168 // No need to recreate the MenuEventHandler for every nested menu. | |
sky
2015/09/09 15:44:52
Again, this is documenting the code not the why.
afakhry
2015/09/09 20:21:33
Done.
| |
169 menu_event_filter.reset(new MenuEventHandler); | |
170 } | |
171 | |
172 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | |
173 base::MessageLoop::ScopedNestableTaskAllower allow(loop); | |
174 base::RunLoop run_loop; | |
175 message_loop_quit_ = run_loop.QuitClosure(); | |
176 | |
177 run_loop.Run(); | |
178 #endif // defined(OS_WIN) | |
183 } | 179 } |
184 | 180 |
185 void MenuMessageLoopAura::QuitNow() { | 181 void MenuMessageLoopAura::QuitNow() { |
186 CHECK(!message_loop_quit_.is_null()); | 182 CHECK(!message_loop_quit_.is_null()); |
187 message_loop_quit_.Run(); | 183 message_loop_quit_.Run(); |
188 | 184 |
189 #if !defined(OS_WIN) | 185 #if !defined(OS_WIN) |
190 // Ask PlatformEventSource to stop dispatching events in this message loop | 186 // Ask PlatformEventSource to stop dispatching events in this message loop |
191 // iteration. We want our menu's loop to return before the next event. | 187 // iteration. We want our menu's loop to return before the next event. |
192 if (ui::PlatformEventSource::GetInstance()) | 188 if (ui::PlatformEventSource::GetInstance()) |
193 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); | 189 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); |
194 #endif | 190 #endif |
195 } | 191 } |
196 | 192 |
197 void MenuMessageLoopAura::ClearOwner() { | 193 void MenuMessageLoopAura::ClearOwner() { |
198 owner_ = NULL; | 194 owner_ = NULL; |
199 } | 195 } |
200 | 196 |
201 } // namespace views | 197 } // namespace views |
OLD | NEW |