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

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

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.cc ('k') | ash/common/shelf/shelf_layout_manager.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.h
diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h
index d651fa2a16580f69d0a3037a823a2be0d56294a7..aae684e4ae8afb06a40d8ce462abf91b66fdc847 100644
--- a/ash/common/shelf/shelf_layout_manager.h
+++ b/ash/common/shelf/shelf_layout_manager.h
@@ -36,6 +36,7 @@ class PanelLayoutManagerTest;
class ShelfLayoutManagerObserver;
class ShelfLayoutManagerTest;
class ShelfWidget;
+class WmShelf;
// ShelfLayoutManager is the layout manager responsible for the shelf and
// status widgets. The shelf is given the total available width and told the
@@ -53,7 +54,7 @@ class ASH_EXPORT ShelfLayoutManager
public wm::WmSnapToPixelLayoutManager,
public SessionStateObserver {
public:
- explicit ShelfLayoutManager(ShelfWidget* shelf_widget);
+ ShelfLayoutManager(ShelfWidget* shelf_widget, WmShelf* wm_shelf);
~ShelfLayoutManager() override;
bool updating_bounds() const { return updating_bounds_; }
@@ -315,6 +316,7 @@ class ASH_EXPORT ShelfLayoutManager
State state_;
ShelfWidget* shelf_widget_;
+ WmShelf* wm_shelf_;
// Do any windows overlap the shelf? This is maintained by WorkspaceManager.
bool window_overlaps_shelf_;
« no previous file with comments | « ash/common/shelf/shelf.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698