| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/wm/core/window_modality_controller.h" | 5 #include "ui/wm/core/window_modality_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 121 |
| 122 void WindowModalityController::OnKeyEvent(ui::KeyEvent* event) { | 122 void WindowModalityController::OnKeyEvent(ui::KeyEvent* event) { |
| 123 aura::Window* target = static_cast<aura::Window*>(event->target()); | 123 aura::Window* target = static_cast<aura::Window*>(event->target()); |
| 124 if (GetModalTransient(target)) | 124 if (GetModalTransient(target)) |
| 125 event->SetHandled(); | 125 event->SetHandled(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void WindowModalityController::OnMouseEvent(ui::MouseEvent* event) { | 128 void WindowModalityController::OnMouseEvent(ui::MouseEvent* event) { |
| 129 aura::Window* target = static_cast<aura::Window*>(event->target()); | 129 aura::Window* target = static_cast<aura::Window*>(event->target()); |
| 130 if (ProcessLocatedEvent(target, event)) | 130 if (ProcessLocatedEvent(target, event)) |
| 131 event->SetHandled(); | 131 event->SetHandled(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void WindowModalityController::OnTouchEvent(ui::TouchEvent* event) { | 134 void WindowModalityController::OnTouchEvent(ui::TouchEvent* event) { |
| 135 aura::Window* target = static_cast<aura::Window*>(event->target()); | 135 aura::Window* target = static_cast<aura::Window*>(event->target()); |
| 136 if (ProcessLocatedEvent(target, event)) | 136 if (ProcessLocatedEvent(target, event)) |
| 137 event->SetHandled(); | 137 event->SetHandled(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 //////////////////////////////////////////////////////////////////////////////// | 140 //////////////////////////////////////////////////////////////////////////////// |
| 141 // WindowModalityController, aura::EnvObserver implementation: | 141 // WindowModalityController, aura::EnvObserver implementation: |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 } | 207 } |
| 208 | 208 |
| 209 AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE); | 209 AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE); |
| 210 } | 210 } |
| 211 if (event->type() == ui::ET_TOUCH_CANCELLED) | 211 if (event->type() == ui::ET_TOUCH_CANCELLED) |
| 212 return false; | 212 return false; |
| 213 return !!modal_transient_child; | 213 return !!modal_transient_child; |
| 214 } | 214 } |
| 215 | 215 |
| 216 } // namespace wm | 216 } // namespace wm |
| OLD | NEW |