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" | 13 #include "ui/aura/env.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/aura/window_tree_host.h" | 16 #include "ui/aura/window_tree_host.h" |
17 #include "ui/events/event.h" | 17 #include "ui/events/event.h" |
18 #include "ui/events/platform/platform_event_source.h" | 18 #include "ui/events/platform/platform_event_source.h" |
19 #include "ui/events/platform/scoped_event_dispatcher.h" | 19 #include "ui/events/platform/scoped_event_dispatcher.h" |
20 #include "ui/views/controls/menu/menu_controller.h" | 20 #include "ui/views/controls/menu/menu_controller.h" |
21 #include "ui/views/controls/menu/menu_event_filter.h" | |
21 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
22 #include "ui/wm/public/activation_change_observer.h" | 23 #include "ui/wm/public/activation_change_observer.h" |
23 #include "ui/wm/public/activation_client.h" | 24 #include "ui/wm/public/activation_client.h" |
24 #include "ui/wm/public/dispatcher_client.h" | 25 #include "ui/wm/public/dispatcher_client.h" |
25 #include "ui/wm/public/drag_drop_client.h" | 26 #include "ui/wm/public/drag_drop_client.h" |
26 | 27 |
27 #if defined(OS_WIN) | 28 #if defined(OS_WIN) |
28 #include "ui/base/win/internal_constants.h" | 29 #include "ui/base/win/internal_constants.h" |
29 #include "ui/views/controls/menu/menu_message_pump_dispatcher_win.h" | 30 #include "ui/views/controls/menu/menu_message_pump_dispatcher_win.h" |
30 #include "ui/views/win/hwnd_util.h" | 31 #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); | 97 DISALLOW_COPY_AND_ASSIGN(ActivationChangeObserverImpl); |
97 }; | 98 }; |
98 | 99 |
99 } // namespace | 100 } // namespace |
100 | 101 |
101 // static | 102 // static |
102 MenuMessageLoop* MenuMessageLoop::Create() { | 103 MenuMessageLoop* MenuMessageLoop::Create() { |
103 return new MenuMessageLoopAura; | 104 return new MenuMessageLoopAura; |
104 } | 105 } |
105 | 106 |
106 MenuMessageLoopAura::MenuMessageLoopAura() : owner_(NULL) { | 107 MenuMessageLoopAura::MenuMessageLoopAura() : owner_(nullptr) { |
107 } | 108 } |
108 | 109 |
109 MenuMessageLoopAura::~MenuMessageLoopAura() { | 110 MenuMessageLoopAura::~MenuMessageLoopAura() { |
110 } | 111 } |
111 | 112 |
112 void MenuMessageLoopAura::RepostEventToWindow(const ui::LocatedEvent& event, | 113 void MenuMessageLoopAura::RepostEventToWindow(const ui::LocatedEvent& event, |
113 gfx::NativeWindow window, | 114 gfx::NativeWindow window, |
114 const gfx::Point& screen_loc) { | 115 const gfx::Point& screen_loc) { |
115 aura::Window* root = window->GetRootWindow(); | 116 aura::Window* root = window->GetRootWindow(); |
116 ScreenPositionClient* spc = aura::client::GetScreenPositionClient(root); | 117 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(); | 151 message_loop_quit_ = run_loop.QuitClosure(); |
151 run_loop.Run(); | 152 run_loop.Run(); |
152 } else { | 153 } else { |
153 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | 154 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); |
154 base::MessageLoop::ScopedNestableTaskAllower allow(loop); | 155 base::MessageLoop::ScopedNestableTaskAllower allow(loop); |
155 base::RunLoop run_loop(&nested_dispatcher); | 156 base::RunLoop run_loop(&nested_dispatcher); |
156 message_loop_quit_ = run_loop.QuitClosure(); | 157 message_loop_quit_ = run_loop.QuitClosure(); |
157 run_loop.Run(); | 158 run_loop.Run(); |
158 } | 159 } |
159 #else | 160 #else |
160 internal::MenuEventDispatcher event_dispatcher(controller); | 161 scoped_ptr<ActivationChangeObserverImpl> observer; |
161 scoped_ptr<ui::ScopedEventDispatcher> dispatcher_override; | 162 MenuEventFilter::Delegate* filter_delegate = nullptr; |
162 if (ui::PlatformEventSource::GetInstance()) { | |
163 dispatcher_override = | |
164 ui::PlatformEventSource::GetInstance()->OverrideDispatcher( | |
165 &event_dispatcher); | |
166 } | |
167 if (root) { | 163 if (root) { |
168 scoped_ptr<ActivationChangeObserverImpl> observer; | |
169 if (!nested_menu) | 164 if (!nested_menu) |
170 observer.reset(new ActivationChangeObserverImpl(controller, root)); | 165 observer.reset(new ActivationChangeObserverImpl(controller, root)); |
171 aura::client::DispatcherRunLoop run_loop( | 166 filter_delegate = MenuEventFilter::GetMenuEventFilterDelegate(root); |
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 } | 167 } |
182 #endif | 168 |
169 scoped_ptr<MenuEventFilter> menu_event_filter( | |
170 new MenuEventFilter(controller, filter_delegate)); | |
oshima
2015/09/02 17:08:21
can't you just create this on stack?
afakhry
2015/09/02 18:18:38
Done.
| |
171 aura::Env::GetInstanceDontCreate()->PrependPreTargetHandler( | |
172 menu_event_filter.get()); | |
173 | |
174 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | |
175 base::MessageLoop::ScopedNestableTaskAllower allow(loop); | |
176 base::RunLoop run_loop; | |
177 message_loop_quit_ = run_loop.QuitClosure(); | |
178 | |
179 run_loop.Run(); | |
180 | |
181 aura::Env::GetInstanceDontCreate()->RemovePreTargetHandler( | |
182 menu_event_filter.get()); | |
183 #endif // defined(OS_WIN) | |
183 } | 184 } |
184 | 185 |
185 void MenuMessageLoopAura::QuitNow() { | 186 void MenuMessageLoopAura::QuitNow() { |
186 CHECK(!message_loop_quit_.is_null()); | 187 CHECK(!message_loop_quit_.is_null()); |
187 message_loop_quit_.Run(); | 188 message_loop_quit_.Run(); |
188 | 189 |
189 #if !defined(OS_WIN) | 190 #if !defined(OS_WIN) |
190 // Ask PlatformEventSource to stop dispatching events in this message loop | 191 // Ask PlatformEventSource to stop dispatching events in this message loop |
191 // iteration. We want our menu's loop to return before the next event. | 192 // iteration. We want our menu's loop to return before the next event. |
192 if (ui::PlatformEventSource::GetInstance()) | 193 if (ui::PlatformEventSource::GetInstance()) |
193 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); | 194 ui::PlatformEventSource::GetInstance()->StopCurrentEventStream(); |
194 #endif | 195 #endif |
195 } | 196 } |
196 | 197 |
197 void MenuMessageLoopAura::ClearOwner() { | 198 void MenuMessageLoopAura::ClearOwner() { |
198 owner_ = NULL; | 199 owner_ = NULL; |
199 } | 200 } |
200 | 201 |
201 } // namespace views | 202 } // namespace views |
OLD | NEW |