| 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 "ash/shared/immersive_fullscreen_controller.h" | 5 #include "ash/shared/immersive_fullscreen_controller.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "ash/shared/immersive_context.h" | 9 #include "ash/shared/immersive_context.h" |
| 10 #include "ash/shared/immersive_focus_watcher.h" | 10 #include "ash/shared/immersive_focus_watcher.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 default: | 227 default: |
| 228 break; | 228 break; |
| 229 } | 229 } |
| 230 } | 230 } |
| 231 | 231 |
| 232 void ImmersiveFullscreenController::OnPointerEventObserved( | 232 void ImmersiveFullscreenController::OnPointerEventObserved( |
| 233 const ui::PointerEvent& event, | 233 const ui::PointerEvent& event, |
| 234 const gfx::Point& location_in_screen, | 234 const gfx::Point& location_in_screen, |
| 235 views::Widget* target) { | 235 views::Widget* target) { |
| 236 if (event.IsMousePointerEvent()) { | 236 if (event.IsMousePointerEvent()) { |
| 237 const ui::MouseEvent mouse_event(event); | 237 if (event.type() == ui::ET_POINTER_WHEEL_CHANGED) { |
| 238 OnMouseEvent(mouse_event, location_in_screen, target); | 238 const ui::MouseWheelEvent mouse_wheel_event(event); |
| 239 OnMouseEvent(mouse_wheel_event, location_in_screen, target); |
| 240 } else { |
| 241 const ui::MouseEvent mouse_event(event); |
| 242 OnMouseEvent(mouse_event, location_in_screen, target); |
| 243 } |
| 239 } else { | 244 } else { |
| 240 DCHECK(event.IsTouchPointerEvent()); | 245 DCHECK(event.IsTouchPointerEvent()); |
| 241 const ui::TouchEvent touch_event(event); | 246 const ui::TouchEvent touch_event(event); |
| 242 OnTouchEvent(touch_event, location_in_screen); | 247 OnTouchEvent(touch_event, location_in_screen); |
| 243 } | 248 } |
| 244 } | 249 } |
| 245 | 250 |
| 246 //////////////////////////////////////////////////////////////////////////////// | 251 //////////////////////////////////////////////////////////////////////////////// |
| 247 // views::WidgetObserver overrides: | 252 // views::WidgetObserver overrides: |
| 248 | 253 |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 location.y() < hit_bounds_in_screen.y() && | 642 location.y() < hit_bounds_in_screen.y() && |
| 638 location.x() >= hit_bounds_in_screen.x() && | 643 location.x() >= hit_bounds_in_screen.x() && |
| 639 location.x() < hit_bounds_in_screen.right()); | 644 location.x() < hit_bounds_in_screen.right()); |
| 640 } | 645 } |
| 641 | 646 |
| 642 gfx::Rect ImmersiveFullscreenController::GetDisplayBoundsInScreen() const { | 647 gfx::Rect ImmersiveFullscreenController::GetDisplayBoundsInScreen() const { |
| 643 return ImmersiveContext::Get()->GetDisplayBoundsInScreen(widget_); | 648 return ImmersiveContext::Get()->GetDisplayBoundsInScreen(widget_); |
| 644 } | 649 } |
| 645 | 650 |
| 646 } // namespace ash | 651 } // namespace ash |
| OLD | NEW |