Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: ash/aura/wm_shelf_aura.cc

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/shelf.h" 10 #include "ash/shelf/shelf.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 156 }
157 157
158 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) { 158 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) {
159 observers_.RemoveObserver(observer); 159 observers_.RemoveObserver(observer);
160 } 160 }
161 161
162 void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) { 162 void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) {
163 shelf_layout_manager_->OnKeyboardBoundsChanging(bounds); 163 shelf_layout_manager_->OnKeyboardBoundsChanging(bounds);
164 } 164 }
165 165
166 ShelfLockingManager* WmShelfAura::GetShelfLockingManagerForTesting() {
167 return shelf_->shelf_locking_manager_for_testing();
168 }
169
166 void WmShelfAura::WillDeleteShelfLayoutManager() { 170 void WmShelfAura::WillDeleteShelfLayoutManager() {
167 ResetShelfLayoutManager(); 171 ResetShelfLayoutManager();
168 } 172 }
169 173
170 void WmShelfAura::OnBackgroundUpdated( 174 void WmShelfAura::OnBackgroundUpdated(
171 ShelfBackgroundType background_type, 175 ShelfBackgroundType background_type,
172 BackgroundAnimatorChangeType change_type) { 176 BackgroundAnimatorChangeType change_type) {
173 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 177 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
174 OnBackgroundUpdated(background_type, change_type)); 178 OnBackgroundUpdated(background_type, change_type));
175 } 179 }
176 180
177 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) { 181 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) {
178 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 182 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
179 WillChangeVisibilityState(new_state)); 183 WillChangeVisibilityState(new_state));
180 } 184 }
181 185
182 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { 186 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
183 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 187 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
184 OnAutoHideStateChanged(new_state)); 188 OnAutoHideStateChanged(new_state));
185 } 189 }
186 190
187 void WmShelfAura::OnShelfIconPositionsChanged() { 191 void WmShelfAura::OnShelfIconPositionsChanged() {
188 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); 192 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
189 } 193 }
190 194
191 } // namespace ash 195 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698