| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/pointer_watcher_delegate_aura.h" | 5 #include "ash/pointer_down_watcher_delegate_aura.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ui/aura/client/screen_position_client.h" | 8 #include "ui/aura/client/screen_position_client.h" |
| 9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
| 11 #include "ui/events/event_constants.h" | 11 #include "ui/events/event_constants.h" |
| 12 #include "ui/gfx/geometry/point.h" | 12 #include "ui/gfx/geometry/point.h" |
| 13 #include "ui/views/pointer_watcher.h" | 13 #include "ui/views/pointer_down_watcher.h" |
| 14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 PointerWatcherDelegateAura::PointerWatcherDelegateAura() { | 18 PointerDownWatcherDelegateAura::PointerDownWatcherDelegateAura() { |
| 19 Shell::GetInstance()->AddPreTargetHandler(this); | 19 Shell::GetInstance()->AddPreTargetHandler(this); |
| 20 } | 20 } |
| 21 | 21 |
| 22 PointerWatcherDelegateAura::~PointerWatcherDelegateAura() { | 22 PointerDownWatcherDelegateAura::~PointerDownWatcherDelegateAura() { |
| 23 Shell::GetInstance()->RemovePreTargetHandler(this); | 23 Shell::GetInstance()->RemovePreTargetHandler(this); |
| 24 } | 24 } |
| 25 | 25 |
| 26 void PointerWatcherDelegateAura::AddPointerWatcher( | 26 void PointerDownWatcherDelegateAura::AddPointerDownWatcher( |
| 27 views::PointerWatcher* watcher) { | 27 views::PointerDownWatcher* watcher) { |
| 28 pointer_watchers_.AddObserver(watcher); | 28 pointer_down_watchers_.AddObserver(watcher); |
| 29 } | 29 } |
| 30 | 30 |
| 31 void PointerWatcherDelegateAura::RemovePointerWatcher( | 31 void PointerDownWatcherDelegateAura::RemovePointerDownWatcher( |
| 32 views::PointerWatcher* watcher) { | 32 views::PointerDownWatcher* watcher) { |
| 33 pointer_watchers_.RemoveObserver(watcher); | 33 pointer_down_watchers_.RemoveObserver(watcher); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) { | 36 void PointerDownWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) { |
| 37 if (event->type() == ui::ET_MOUSE_PRESSED) | 37 if (event->type() == ui::ET_MOUSE_PRESSED) |
| 38 FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_, | 38 FOR_EACH_OBSERVER(views::PointerDownWatcher, pointer_down_watchers_, |
| 39 OnMousePressed(*event, GetLocationInScreen(*event), | 39 OnMousePressed(*event, GetLocationInScreen(*event), |
| 40 GetTargetWidget(*event))); | 40 GetTargetWidget(*event))); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) { | 43 void PointerDownWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) { |
| 44 if (event->type() == ui::ET_TOUCH_PRESSED) | 44 if (event->type() == ui::ET_TOUCH_PRESSED) |
| 45 FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_, | 45 FOR_EACH_OBSERVER(views::PointerDownWatcher, pointer_down_watchers_, |
| 46 OnTouchPressed(*event, GetLocationInScreen(*event), | 46 OnTouchPressed(*event, GetLocationInScreen(*event), |
| 47 GetTargetWidget(*event))); | 47 GetTargetWidget(*event))); |
| 48 } | 48 } |
| 49 | 49 |
| 50 gfx::Point PointerWatcherDelegateAura::GetLocationInScreen( | 50 gfx::Point PointerDownWatcherDelegateAura::GetLocationInScreen( |
| 51 const ui::LocatedEvent& event) const { | 51 const ui::LocatedEvent& event) const { |
| 52 aura::Window* target = static_cast<aura::Window*>(event.target()); | 52 aura::Window* target = static_cast<aura::Window*>(event.target()); |
| 53 gfx::Point location_in_screen = event.location(); | 53 gfx::Point location_in_screen = event.location(); |
| 54 aura::client::GetScreenPositionClient(target->GetRootWindow()) | 54 aura::client::GetScreenPositionClient(target->GetRootWindow()) |
| 55 ->ConvertPointToScreen(target, &location_in_screen); | 55 ->ConvertPointToScreen(target, &location_in_screen); |
| 56 return location_in_screen; | 56 return location_in_screen; |
| 57 } | 57 } |
| 58 | 58 |
| 59 views::Widget* PointerWatcherDelegateAura::GetTargetWidget( | 59 views::Widget* PointerDownWatcherDelegateAura::GetTargetWidget( |
| 60 const ui::LocatedEvent& event) const { | 60 const ui::LocatedEvent& event) const { |
| 61 aura::Window* window = static_cast<aura::Window*>(event.target()); | 61 aura::Window* window = static_cast<aura::Window*>(event.target()); |
| 62 return views::Widget::GetTopLevelWidgetForNativeView(window); | 62 return views::Widget::GetTopLevelWidgetForNativeView(window); |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace ash | 65 } // namespace ash |
| OLD | NEW |