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

Unified Diff: ash/common/shelf/wm_shelf.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_layout_manager.cc ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/wm_shelf.cc
diff --git a/ash/common/shelf/wm_shelf.cc b/ash/common/shelf/wm_shelf.cc
index b796d61b660e63183cf1328de5f18df415247e45..4fd8c28eb49d147c7bd17b9504fa76b9895481c2 100644
--- a/ash/common/shelf/wm_shelf.cc
+++ b/ash/common/shelf/wm_shelf.cc
@@ -62,7 +62,7 @@ void WmShelf::SetAlignment(ShelfAlignment alignment) {
alignment_ = alignment;
// The ShelfWidget notifies the ShelfView of the alignment change.
shelf_layout_manager_->shelf_widget()->OnShelfAlignmentChanged();
- WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(shelf_);
+ WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(this);
WmShell::Get()->NotifyShelfAlignmentChanged(GetWindow()->GetRootWindow());
// ShelfLayoutManager will resize the shelf.
}
@@ -107,7 +107,7 @@ void WmShelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
return;
auto_hide_behavior_ = auto_hide_behavior;
- WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(shelf_);
+ WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(this);
WmShell::Get()->NotifyShelfAutoHideBehaviorChanged(
GetWindow()->GetRootWindow());
}
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698