| 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 #ifndef UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ | 5 #ifndef UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ |
| 6 #define UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ | 6 #define UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "ui/aura/env_observer.h" | 11 #include "ui/aura/env_observer.h" |
| 12 #include "ui/aura/window_observer.h" | 12 #include "ui/aura/window_observer.h" |
| 13 #include "ui/base/events/event_handler.h" | 13 #include "ui/base/events/event_handler.h" |
| 14 #include "ui/views/views_export.h" | 14 #include "ui/views/views_export.h" |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 class LocatedEvent; | 17 class LocatedEvent; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace views { | 20 namespace views { |
| 21 namespace corewm { | 21 namespace corewm { |
| 22 | 22 |
| 23 // Sets the modal parent for the child. | 23 // Sets the modal parent for the child. |
| 24 VIEWS_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent); | 24 VIEWS_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent); |
| 25 | 25 |
| 26 // Returns the modal transient child of |window|, or NULL if |window| does not | 26 // Returns the modal transient child of |window|, or NULL if |window| does not |
| 27 // have any modal transient children. | 27 // have any modal transient children. |
| 28 VIEWS_EXPORT aura::Window* GetModalTransient(aura::Window* window); | 28 VIEWS_EXPORT aura::Window* GetModalTransient(aura::Window* window); |
| 29 // |activatable| must be activatable. |
| 30 aura::Window* GetModalTransientForActivatableWindow(aura::Window* activatable); |
| 29 | 31 |
| 30 // WindowModalityController is an event filter that consumes events sent to | 32 // WindowModalityController is an event filter that consumes events sent to |
| 31 // windows that are the transient parents of window-modal windows. This filter | 33 // windows that are the transient parents of window-modal windows. This filter |
| 32 // must be added to the CompoundEventFilter so that activation works properly. | 34 // must be added to the CompoundEventFilter so that activation works properly. |
| 33 class VIEWS_EXPORT WindowModalityController : public ui::EventHandler, | 35 class VIEWS_EXPORT WindowModalityController : public ui::EventHandler, |
| 34 public aura::EnvObserver, | 36 public aura::EnvObserver, |
| 35 public aura::WindowObserver { | 37 public aura::WindowObserver { |
| 36 public: | 38 public: |
| 37 WindowModalityController(); | 39 WindowModalityController(); |
| 38 virtual ~WindowModalityController(); | 40 virtual ~WindowModalityController(); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 58 | 60 |
| 59 std::vector<aura::Window*> windows_; | 61 std::vector<aura::Window*> windows_; |
| 60 | 62 |
| 61 DISALLOW_COPY_AND_ASSIGN(WindowModalityController); | 63 DISALLOW_COPY_AND_ASSIGN(WindowModalityController); |
| 62 }; | 64 }; |
| 63 | 65 |
| 64 } // namespace corewm | 66 } // namespace corewm |
| 65 } // namespace views | 67 } // namespace views |
| 66 | 68 |
| 67 #endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ | 69 #endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ |
| OLD | NEW |