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

Unified Diff: mash/wm/status_layout_manager.h

Issue 1950293003: mash: Add status area container to mash window manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/status_layout_manager.h
diff --git a/mash/wm/shelf_layout.h b/mash/wm/status_layout_manager.h
similarity index 46%
rename from mash/wm/shelf_layout.h
rename to mash/wm/status_layout_manager.h
index ccef7da3331b357e6c69a34595c7747128eededf..1eb41e4554356a12a5d2d76fc5456bbec3b7b487 100644
--- a/mash/wm/shelf_layout.h
+++ b/mash/wm/status_layout_manager.h
@@ -2,38 +2,37 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MASH_WM_SHELF_LAYOUT_H_
-#define MASH_WM_SHELF_LAYOUT_H_
+#ifndef MASH_WM_STATUS_LAYOUT_MANAGER_H_
+#define MASH_WM_STATUS_LAYOUT_MANAGER_H_
#include "base/macros.h"
+#include "mash/shelf/public/interfaces/shelf_constants.mojom.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, public mojom::ShelfLayout {
+// Lays out the status container, which contains the status area widget and
+// notifications.
+class StatusLayoutManager : public LayoutManager {
public:
- explicit ShelfLayout(mus::Window* owner);
- ~ShelfLayout() override;
+ explicit StatusLayoutManager(mus::Window* owner);
+ ~StatusLayoutManager() override;
+
+ void SetAlignment(mash::shelf::mojom::Alignment alignment);
+ void SetAutoHideBehavior(mash::shelf::mojom::AutoHideBehavior auto_hide);
private:
// Overridden from LayoutManager:
void LayoutWindow(mus::Window* window) override;
- // Overridden from mojom::ShelfLayout:
- void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
- void SetAutoHideBehavior(
- mash::shelf::mojom::AutoHideBehavior auto_hide) override;
-
mash::shelf::mojom::Alignment alignment_;
mash::shelf::mojom::AutoHideBehavior auto_hide_behavior_;
- DISALLOW_COPY_AND_ASSIGN(ShelfLayout);
+ DISALLOW_COPY_AND_ASSIGN(StatusLayoutManager);
};
} // namespace wm
} // namespace mash
-#endif // MASH_WM_SHELF_LAYOUT_H_
+#endif // MASH_WM_STATUS_LAYOUT_MANAGER_H_

Powered by Google App Engine
This is Rietveld 408576698