| Index: ui/views/mus/platform_window_mus.cc
|
| diff --git a/ui/views/mus/platform_window_mus.cc b/ui/views/mus/platform_window_mus.cc
|
| index fcf21a1bef34ba9048b7f2d8df26ceb0639bbe16..ca52025706cba591c00971f92c16129216315c5e 100644
|
| --- a/ui/views/mus/platform_window_mus.cc
|
| +++ b/ui/views/mus/platform_window_mus.cc
|
| @@ -68,7 +68,7 @@ PlatformWindowMus::PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
|
| mus::Window* mus_window)
|
| : delegate_(delegate),
|
| mus_window_(mus_window),
|
| - show_state_(mus::mojom::ShowState::RESTORED),
|
| + show_state_(mus::mojom::ShowState::DEFAULT),
|
| last_cursor_(mus::mojom::Cursor::CURSOR_NULL),
|
| mus_window_destroyed_(false) {
|
| DCHECK(delegate_);
|
| @@ -165,7 +165,7 @@ void PlatformWindowMus::Minimize() {
|
| }
|
|
|
| void PlatformWindowMus::Restore() {
|
| - SetShowState(mus::mojom::ShowState::RESTORED);
|
| + SetShowState(mus::mojom::ShowState::NORMAL);
|
| }
|
|
|
| void PlatformWindowMus::SetCursor(ui::PlatformCursor cursor) {
|
| @@ -246,12 +246,14 @@ void PlatformWindowMus::OnWindowSharedPropertyChanged(
|
| case mus::mojom::ShowState::MAXIMIZED:
|
| state = ui::PLATFORM_WINDOW_STATE_MAXIMIZED;
|
| break;
|
| - case mus::mojom::ShowState::RESTORED:
|
| + case mus::mojom::ShowState::DEFAULT:
|
| + case mus::mojom::ShowState::INACTIVE:
|
| + case mus::mojom::ShowState::NORMAL:
|
| + case mus::mojom::ShowState::DOCKED:
|
| + // TODO(sky): support docked.
|
| state = ui::PLATFORM_WINDOW_STATE_NORMAL;
|
| break;
|
| - case mus::mojom::ShowState::IMMERSIVE:
|
| - case mus::mojom::ShowState::PRESENTATION:
|
| - // This may not be sufficient.
|
| + case mus::mojom::ShowState::FULLSCREEN:
|
| state = ui::PLATFORM_WINDOW_STATE_FULLSCREEN;
|
| break;
|
| }
|
|
|