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

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

Issue 2187953002: mash: Migrate ShelfButton* to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
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() { 166 ShelfLockingManager* WmShelfAura::GetShelfLockingManagerForTesting() {
167 return shelf_->shelf_locking_manager_for_testing(); 167 return shelf_->shelf_locking_manager_for_testing();
168 } 168 }
169 169
170 ShelfView* WmShelfAura::GetShelfViewForTesting() {
171 return shelf_->shelf_view_for_testing();
172 }
173
170 void WmShelfAura::WillDeleteShelfLayoutManager() { 174 void WmShelfAura::WillDeleteShelfLayoutManager() {
171 ResetShelfLayoutManager(); 175 ResetShelfLayoutManager();
172 } 176 }
173 177
174 void WmShelfAura::OnBackgroundUpdated( 178 void WmShelfAura::OnBackgroundUpdated(
175 ShelfBackgroundType background_type, 179 ShelfBackgroundType background_type,
176 BackgroundAnimatorChangeType change_type) { 180 BackgroundAnimatorChangeType change_type) {
177 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 181 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
178 OnBackgroundUpdated(background_type, change_type)); 182 OnBackgroundUpdated(background_type, change_type));
179 } 183 }
180 184
181 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) { 185 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) {
182 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 186 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
183 WillChangeVisibilityState(new_state)); 187 WillChangeVisibilityState(new_state));
184 } 188 }
185 189
186 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { 190 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
187 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 191 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
188 OnAutoHideStateChanged(new_state)); 192 OnAutoHideStateChanged(new_state));
189 } 193 }
190 194
191 void WmShelfAura::OnShelfIconPositionsChanged() { 195 void WmShelfAura::OnShelfIconPositionsChanged() {
192 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); 196 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
193 } 197 }
194 198
195 } // namespace ash 199 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shelf_aura.h ('k') | ash/common/shelf/DEPS » ('j') | ash/common/shelf/wm_shelf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698