OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_SHELF_SHELF_WINDOW_WATCHER_H_ | 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_ |
6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ | 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ |
7 | 7 |
8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h" | 8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 // aura::WindowObserver overrides: | 109 // aura::WindowObserver overrides: |
110 virtual void OnWindowAdded(aura::Window* window) OVERRIDE; | 110 virtual void OnWindowAdded(aura::Window* window) OVERRIDE; |
111 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; | 111 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; |
112 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; | 112 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; |
113 virtual void OnWindowPropertyChanged(aura::Window* window, | 113 virtual void OnWindowPropertyChanged(aura::Window* window, |
114 const void* key, | 114 const void* key, |
115 intptr_t old) OVERRIDE; | 115 intptr_t old) OVERRIDE; |
116 | 116 |
117 // gfx::DisplayObserver overrides: | 117 // gfx::DisplayObserver overrides: |
118 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | |
119 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; | 118 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; |
120 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 119 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
| 120 virtual void OnDisplayMetricsChanged(const gfx::Display& display, |
| 121 uint32_t metrics) OVERRIDE; |
121 | 122 |
122 // Owned by Shell. | 123 // Owned by Shell. |
123 ShelfModel* model_; | 124 ShelfModel* model_; |
124 ShelfItemDelegateManager* item_delegate_manager_; | 125 ShelfItemDelegateManager* item_delegate_manager_; |
125 | 126 |
126 RootWindowObserver root_window_observer_; | 127 RootWindowObserver root_window_observer_; |
127 | 128 |
128 RemovedWindowObserver removed_window_observer_; | 129 RemovedWindowObserver removed_window_observer_; |
129 | 130 |
130 // Holds all observed windows. | 131 // Holds all observed windows. |
131 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; | 132 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; |
132 | 133 |
133 // Holds all observed root windows. | 134 // Holds all observed root windows. |
134 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; | 135 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; |
135 | 136 |
136 // Holds removed windows that has an item from default container. | 137 // Holds removed windows that has an item from default container. |
137 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_; | 138 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_; |
138 | 139 |
139 // Holds all observed activation clients. | 140 // Holds all observed activation clients. |
140 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, | 141 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, |
141 aura::client::ActivationChangeObserver> observed_activation_clients_; | 142 aura::client::ActivationChangeObserver> observed_activation_clients_; |
142 | 143 |
143 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); | 144 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); |
144 }; | 145 }; |
145 | 146 |
146 } // namespace ash | 147 } // namespace ash |
147 | 148 |
148 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ | 149 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ |
OLD | NEW |