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

Unified Diff: ash/common/shelf/shelf_layout_manager.cc

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: curlies 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_delegate.h ('k') | ash/common/shelf/wm_shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_layout_manager.cc
diff --git a/ash/common/shelf/shelf_layout_manager.cc b/ash/common/shelf/shelf_layout_manager.cc
index bf1aa412cc5680430f597f61d06161f93d1b3f6e..eb25188a57740c3bd8bb68986b69131f2f9fb495 100644
--- a/ash/common/shelf/shelf_layout_manager.cc
+++ b/ash/common/shelf/shelf_layout_manager.cc
@@ -568,7 +568,7 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
ShelfDelegate* shelf_delegate = WmShell::Get()->shelf_delegate();
DCHECK(shelf_delegate);
if (old_state.visibility_state != state_.visibility_state)
- shelf_delegate->OnShelfVisibilityStateChanged(shelf_widget_->shelf());
+ shelf_delegate->OnShelfVisibilityStateChanged(wm_shelf_);
// OnAutoHideStateChanged Should be emitted when:
// - firstly state changed to auto-hide from other state
@@ -576,7 +576,7 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
if ((old_state.visibility_state != state_.visibility_state &&
state_.visibility_state == SHELF_AUTO_HIDE) ||
old_state.auto_hide_state != state_.auto_hide_state) {
- shelf_delegate->OnShelfAutoHideStateChanged(shelf_widget_->shelf());
+ shelf_delegate->OnShelfAutoHideStateChanged(wm_shelf_);
FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,
OnAutoHideStateChanged(state_.auto_hide_state));
}
« no previous file with comments | « ash/common/shelf/shelf_delegate.h ('k') | ash/common/shelf/wm_shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698