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/views/corewm/window_modality_controller.h" | 5 #include "ui/views/corewm/window_modality_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/capture_client.h" | 10 #include "ui/aura/client/capture_client.h" |
11 #include "ui/aura/env.h" | 11 #include "ui/aura/env.h" |
12 #include "ui/aura/root_window.h" | |
13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 #include "ui/aura/window_event_dispatcher.h" |
14 #include "ui/aura/window_property.h" | 14 #include "ui/aura/window_property.h" |
15 #include "ui/base/ui_base_types.h" | 15 #include "ui/base/ui_base_types.h" |
16 #include "ui/events/event.h" | 16 #include "ui/events/event.h" |
17 #include "ui/events/event_target.h" | 17 #include "ui/events/event_target.h" |
18 #include "ui/events/gestures/gesture_recognizer.h" | 18 #include "ui/events/gestures/gesture_recognizer.h" |
19 #include "ui/views/corewm/window_animations.h" | 19 #include "ui/views/corewm/window_animations.h" |
20 #include "ui/views/corewm/window_util.h" | 20 #include "ui/views/corewm/window_util.h" |
21 | 21 |
22 namespace views { | 22 namespace views { |
23 namespace corewm { | 23 namespace corewm { |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 event->type() == ui::ET_TOUCH_PRESSED)) { | 187 event->type() == ui::ET_TOUCH_PRESSED)) { |
188 AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE); | 188 AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE); |
189 } | 189 } |
190 if (event->type() == ui::ET_TOUCH_CANCELLED) | 190 if (event->type() == ui::ET_TOUCH_CANCELLED) |
191 return false; | 191 return false; |
192 return !!modal_transient_child; | 192 return !!modal_transient_child; |
193 } | 193 } |
194 | 194 |
195 } // namespace corewm | 195 } // namespace corewm |
196 } // namespace views | 196 } // namespace views |
OLD | NEW |