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

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

Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments 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/common/shelf/wm_shelf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_widget.cc
diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
index aa6afdd45939fa225f6f854e8d05f7fb7f96b240..e4d0d02335850fc710d30cda5685091e3c25d025 100644
--- a/ash/common/shelf/shelf_widget.cc
+++ b/ash/common/shelf/shelf_widget.cc
@@ -313,7 +313,7 @@ ShelfWidget::ShelfWidget(WmWindow* shelf_container,
SetContentsView(delegate_view_);
delegate_view_->SetParentLayer(GetLayer());
- shelf_layout_manager_ = new ShelfLayoutManager(this);
+ shelf_layout_manager_ = new ShelfLayoutManager(this, wm_shelf_);
shelf_layout_manager_->AddObserver(this);
shelf_container->SetLayoutManager(base::WrapUnique(shelf_layout_manager_));
background_animator_.PaintBackground(
@@ -407,6 +407,7 @@ ShelfAlignment ShelfWidget::GetAlignment() const {
}
void ShelfWidget::OnShelfAlignmentChanged() {
+ shelf_view_->OnShelfAlignmentChanged();
status_area_widget_->SetShelfAlignment(GetAlignment());
delegate_view_->SchedulePaint();
}
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698