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 ASH_SHELL_WINDOW_WATCHER_H_ | 5 #ifndef ASH_SHELL_WINDOW_WATCHER_H_ |
6 #define ASH_SHELL_WINDOW_WATCHER_H_ | 6 #define ASH_SHELL_WINDOW_WATCHER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "ash/shelf/shelf_item_types.h" | 10 #include "ash/shelf/shelf_item_types.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 WindowWatcher(); | 31 WindowWatcher(); |
32 virtual ~WindowWatcher(); | 32 virtual ~WindowWatcher(); |
33 | 33 |
34 aura::Window* GetWindowByID(ash::ShelfID id); | 34 aura::Window* GetWindowByID(ash::ShelfID id); |
35 | 35 |
36 // aura::WindowObserver overrides: | 36 // aura::WindowObserver overrides: |
37 virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; | 37 virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; |
38 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; | 38 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; |
39 | 39 |
40 // gfx::DisplayObserver overrides: | 40 // gfx::DisplayObserver overrides: |
41 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | |
42 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 41 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
43 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 42 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
| 43 virtual void OnDisplayMetricsChanged(const gfx::Display& display, |
| 44 uint32_t metrics) OVERRIDE; |
44 | 45 |
45 private: | 46 private: |
46 class WorkspaceWindowWatcher; | 47 class WorkspaceWindowWatcher; |
47 | 48 |
48 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow; | 49 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow; |
49 | 50 |
50 // Maps from window to the id we gave it. | 51 // Maps from window to the id we gave it. |
51 IDToWindow id_to_window_; | 52 IDToWindow id_to_window_; |
52 | 53 |
53 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_; | 54 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_; |
54 | 55 |
55 DISALLOW_COPY_AND_ASSIGN(WindowWatcher); | 56 DISALLOW_COPY_AND_ASSIGN(WindowWatcher); |
56 }; | 57 }; |
57 | 58 |
58 } // namespace shell | 59 } // namespace shell |
59 } // namespace ash | 60 } // namespace ash |
60 | 61 |
61 #endif // ASH_SHELL_WINDOW_WATCHER_H_ | 62 #endif // ASH_SHELL_WINDOW_WATCHER_H_ |
OLD | NEW |