| 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" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 // Overridden from ui::EventHandler: | 40 // Overridden from ui::EventHandler: |
| 41 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; | 41 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; |
| 42 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; | 42 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
| 43 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; | 43 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; |
| 44 | 44 |
| 45 // Overridden from aura::EnvObserver: | 45 // Overridden from aura::EnvObserver: |
| 46 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; | 46 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; |
| 47 | 47 |
| 48 // Overridden from aura::WindowObserver: | 48 // Overridden from aura::WindowObserver: |
| 49 virtual void OnWindowPropertyChanged(aura::Window* window, |
| 50 const void* key, |
| 51 intptr_t old) OVERRIDE; |
| 49 virtual void OnWindowVisibilityChanged(aura::Window* window, | 52 virtual void OnWindowVisibilityChanged(aura::Window* window, |
| 50 bool visible) OVERRIDE; | 53 bool visible) OVERRIDE; |
| 51 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; | 54 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; |
| 52 | 55 |
| 53 private: | 56 private: |
| 54 // Processes a mouse/touch event, and returns true if the event should be | 57 // Processes a mouse/touch event, and returns true if the event should be |
| 55 // consumed. | 58 // consumed. |
| 56 bool ProcessLocatedEvent(aura::Window* target, | 59 bool ProcessLocatedEvent(aura::Window* target, |
| 57 ui::LocatedEvent* event); | 60 ui::LocatedEvent* event); |
| 58 | 61 |
| 59 std::vector<aura::Window*> windows_; | 62 std::vector<aura::Window*> windows_; |
| 60 | 63 |
| 61 DISALLOW_COPY_AND_ASSIGN(WindowModalityController); | 64 DISALLOW_COPY_AND_ASSIGN(WindowModalityController); |
| 62 }; | 65 }; |
| 63 | 66 |
| 64 } // namespace corewm | 67 } // namespace corewm |
| 65 } // namespace views | 68 } // namespace views |
| 66 | 69 |
| 67 #endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ | 70 #endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ |
| OLD | NEW |