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

Unified Diff: mash/wm/shelf_layout.h

Issue 1835403002: Support additional mash shelf alignments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: mash/wm/shelf_layout.h
diff --git a/mash/wm/shelf_layout.h b/mash/wm/shelf_layout.h
index 44f318230363cbb2e38ded63e2d2068952dffe66..4591f8e2be4455e3bc8ba75c7432ea98bb31985d 100644
--- a/mash/wm/shelf_layout.h
+++ b/mash/wm/shelf_layout.h
@@ -7,12 +7,14 @@
#include "base/macros.h"
#include "mash/wm/layout_manager.h"
+#include "mash/wm/public/interfaces/shelf_layout.mojom.h"
namespace mash {
namespace wm {
// Lays out the shelf within shelf containers.
-class ShelfLayout : public LayoutManager {
+class ShelfLayout : public LayoutManager,
+ public mojom::ShelfLayout {
public:
explicit ShelfLayout(mus::Window* owner);
~ShelfLayout() override;
@@ -21,6 +23,13 @@ class ShelfLayout : public LayoutManager {
// Overridden from LayoutManager:
void LayoutWindow(mus::Window* window) override;
+ // Overridden from mojom::ShelfLayout:
+ void SetAlignment(mojom::ShelfAlignment alignment) override;
+ void SetAutoHideBehavior(mojom::ShelfAutoHideBehavior auto_hide) override;
+
+ mojom::ShelfAlignment alignment_;
+ mojom::ShelfAutoHideBehavior auto_hide_;
+
DISALLOW_COPY_AND_ASSIGN(ShelfLayout);
};

Powered by Google App Engine
This is Rietveld 408576698