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

Unified Diff: ash/mus/sysui_application.cc

Issue 1950293003: mash: Add status area container to mash window manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments 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
« no previous file with comments | « no previous file | mash/wm/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/sysui_application.cc
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
index d474bfc06add75d5ec33c04a1c951e59fa32ecb0..21df9e6ddd4f847bc5743ee59f260f955ab4c324 100644
--- a/ash/mus/sysui_application.cc
+++ b/ash/mus/sysui_application.cc
@@ -64,11 +64,10 @@ mash::wm::mojom::Container GetContainerId(
const int id = params.parent->id();
if (id == kShellWindowId_DesktopBackgroundContainer)
return mash::wm::mojom::Container::USER_BACKGROUND;
- // mash::wm::ShelfLayout manages both the shelf and the status area.
- if (id == kShellWindowId_ShelfContainer ||
- id == kShellWindowId_StatusContainer) {
+ if (id == kShellWindowId_ShelfContainer)
return mash::wm::mojom::Container::USER_SHELF;
- }
+ if (id == kShellWindowId_StatusContainer)
+ return mash::wm::mojom::Container::STATUS;
// Determine the container based on Widget type.
switch (params.type) {
« no previous file with comments | « no previous file | mash/wm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698