Chromium Code Reviews| Index: mash/wm/window_layout.cc |
| diff --git a/mash/wm/window_layout.cc b/mash/wm/window_layout.cc |
| index 3cd6807f413896366e813efc5e8e7ebfef13a7b5..e8ebd258ac2701b8deeabfaddfd6f1680a3cc497 100644 |
| --- a/mash/wm/window_layout.cc |
| +++ b/mash/wm/window_layout.cc |
| @@ -36,11 +36,13 @@ void WindowLayout::LayoutWindow(mus::Window* window) { |
| switch (show_state) { |
| case mus::mojom::ShowState::MAXIMIZED: |
| - case mus::mojom::ShowState::IMMERSIVE: |
| - case mus::mojom::ShowState::PRESENTATION: |
| + case mus::mojom::ShowState::FULLSCREEN: |
| FitToContainer(window); |
| break; |
| - case mus::mojom::ShowState::RESTORED: { |
| + case mus::mojom::ShowState::DOCKED: |
| + case mus::mojom::ShowState::INACTIVE: |
| + case mus::mojom::ShowState::DEFAULT: |
| + case mus::mojom::ShowState::NORMAL: { |
|
James Cook
2016/05/06 19:46:47
nit: order these either alphabetically, or in the
sky
2016/05/06 22:12:57
Done.
|
| if (!user_set_bounds.IsEmpty()) { |
| // If the bounds are unchanged, this will do nothing. |
| window->SetBounds(user_set_bounds); |