OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/event_utils.h" | 5 #include "ui/views/event_utils.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "ui/aura/client/screen_position_client.h" | 9 #include "ui/aura/client/screen_position_client.h" |
10 #include "ui/aura/window_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 // thread. | 24 // thread. |
25 HWND target_window = NULL; | 25 HWND target_window = NULL; |
26 if (!window) { | 26 if (!window) { |
27 target_window = ::WindowFromPoint(event.location().ToPOINT()); | 27 target_window = ::WindowFromPoint(event.location().ToPOINT()); |
28 if (::GetWindowThreadProcessId(target_window, NULL) != | 28 if (::GetWindowThreadProcessId(target_window, NULL) != |
29 ::GetCurrentThreadId()) | 29 ::GetCurrentThreadId()) |
30 return false; | 30 return false; |
31 } else { | 31 } else { |
32 if (ViewsDelegate::views_delegate && | 32 if (ViewsDelegate::views_delegate && |
33 !ViewsDelegate::views_delegate->IsWindowInMetro(window)) | 33 !ViewsDelegate::views_delegate->IsWindowInMetro(window)) |
34 target_window = window->GetDispatcher()->host()->GetAcceleratedWidget(); | 34 target_window = window->GetHost()->GetAcceleratedWidget(); |
35 } | 35 } |
36 return RepostLocatedEventWin(target_window, event); | 36 return RepostLocatedEventWin(target_window, event); |
37 #endif | 37 #endif |
38 if (!window) | 38 if (!window) |
39 return false; | 39 return false; |
40 | 40 |
41 aura::Window* root_window = window->GetRootWindow(); | 41 aura::Window* root_window = window->GetRootWindow(); |
42 | 42 |
43 gfx::Point root_loc(event.location()); | 43 gfx::Point root_loc(event.location()); |
44 ScreenPositionClient* spc = | 44 ScreenPositionClient* spc = |
(...skipping 11 matching lines...) Expand all Loading... |
56 // TODO(rbyers): Gesture event repost is tricky to get right | 56 // TODO(rbyers): Gesture event repost is tricky to get right |
57 // crbug.com/170987. | 57 // crbug.com/170987. |
58 return false; | 58 return false; |
59 } else { | 59 } else { |
60 NOTREACHED(); | 60 NOTREACHED(); |
61 return false; | 61 return false; |
62 } | 62 } |
63 relocated->set_location(root_loc); | 63 relocated->set_location(root_loc); |
64 relocated->set_root_location(root_loc); | 64 relocated->set_root_location(root_loc); |
65 | 65 |
66 root_window->GetDispatcher()->RepostEvent(*relocated); | 66 root_window->GetHost()->dispatcher()->RepostEvent(*relocated); |
67 return true; | 67 return true; |
68 } | 68 } |
69 | 69 |
70 } // namespace views | 70 } // namespace views |
OLD | NEW |