| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "ash/aura/wm_shelf_aura.h" | 5 #include "ash/aura/wm_shelf_aura.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/shelf/wm_shelf_observer.h" | 8 #include "ash/common/shelf/wm_shelf_observer.h" |
| 9 #include "ash/common/wm_window.h" | 9 #include "ash/common/wm_window.h" |
| 10 #include "ash/shelf/dimmer_view.h" | 10 #include "ash/shelf/dimmer_view.h" |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 } | 178 } |
| 179 | 179 |
| 180 void WmShelfAura::AddObserver(WmShelfObserver* observer) { | 180 void WmShelfAura::AddObserver(WmShelfObserver* observer) { |
| 181 observers_.AddObserver(observer); | 181 observers_.AddObserver(observer); |
| 182 } | 182 } |
| 183 | 183 |
| 184 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) { | 184 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) { |
| 185 observers_.RemoveObserver(observer); | 185 observers_.RemoveObserver(observer); |
| 186 } | 186 } |
| 187 | 187 |
| 188 StatusAreaWidget* WmShelfAura::GetStatusAreaWidget() { |
| 189 return shelf_layout_manager_->shelf_widget()->status_area_widget(); |
| 190 } |
| 191 |
| 188 void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) { | 192 void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) { |
| 189 shelf_layout_manager_->OnKeyboardBoundsChanging(bounds); | 193 shelf_layout_manager_->OnKeyboardBoundsChanging(bounds); |
| 190 } | 194 } |
| 191 | 195 |
| 192 ShelfLockingManager* WmShelfAura::GetShelfLockingManagerForTesting() { | 196 ShelfLockingManager* WmShelfAura::GetShelfLockingManagerForTesting() { |
| 193 return shelf_->shelf_locking_manager_for_testing(); | 197 return shelf_->shelf_locking_manager_for_testing(); |
| 194 } | 198 } |
| 195 | 199 |
| 196 ShelfView* WmShelfAura::GetShelfViewForTesting() { | 200 ShelfView* WmShelfAura::GetShelfViewForTesting() { |
| 197 return shelf_->shelf_view_for_testing(); | 201 return shelf_->shelf_view_for_testing(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 225 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { | 229 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { |
| 226 FOR_EACH_OBSERVER(WmShelfObserver, observers_, | 230 FOR_EACH_OBSERVER(WmShelfObserver, observers_, |
| 227 OnAutoHideStateChanged(new_state)); | 231 OnAutoHideStateChanged(new_state)); |
| 228 } | 232 } |
| 229 | 233 |
| 230 void WmShelfAura::OnShelfIconPositionsChanged() { | 234 void WmShelfAura::OnShelfIconPositionsChanged() { |
| 231 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); | 235 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); |
| 232 } | 236 } |
| 233 | 237 |
| 234 } // namespace ash | 238 } // namespace ash |
| OLD | NEW |