OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef UI_AURA_SHELL_MODAL_CONTAINER_LAYOUT_MANAGER_H_ | 5 #ifndef ASH_WM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ |
6 #define UI_AURA_SHELL_MODAL_CONTAINER_LAYOUT_MANAGER_H_ | 6 #define ASH_WM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
| 11 #include "ash/wm/modality_event_filter_delegate.h" |
11 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
12 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
14 #include "ui/aura/layout_manager.h" | 15 #include "ui/aura/layout_manager.h" |
15 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" |
16 #include "ui/aura_shell/aura_shell_export.h" | 17 #include "ui/aura_shell/aura_shell_export.h" |
17 #include "ui/aura_shell/modality_event_filter_delegate.h" | |
18 #include "ui/gfx/compositor/layer_animation_observer.h" | 18 #include "ui/gfx/compositor/layer_animation_observer.h" |
19 | 19 |
20 namespace aura { | 20 namespace aura { |
21 class Window; | 21 class Window; |
22 class EventFilter; | 22 class EventFilter; |
23 } | 23 } |
24 namespace gfx { | 24 namespace gfx { |
25 class Rect; | 25 class Rect; |
26 } | 26 } |
27 namespace views { | 27 namespace views { |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 // |modal_windows_|. The event filter is attached when a modal window is | 92 // |modal_windows_|. The event filter is attached when a modal window is |
93 // added, and removed when the last is closed. | 93 // added, and removed when the last is closed. |
94 scoped_ptr<aura::EventFilter> modality_filter_; | 94 scoped_ptr<aura::EventFilter> modality_filter_; |
95 | 95 |
96 DISALLOW_COPY_AND_ASSIGN(ModalContainerLayoutManager); | 96 DISALLOW_COPY_AND_ASSIGN(ModalContainerLayoutManager); |
97 }; | 97 }; |
98 | 98 |
99 } // namespace internal | 99 } // namespace internal |
100 } // namespace aura_shell | 100 } // namespace aura_shell |
101 | 101 |
102 #endif // UI_AURA_SHELL_MODAL_CONTAINER_LAYOUT_MANAGER_H_ | 102 #endif // ASH_WM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ |
OLD | NEW |