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

Unified Diff: ui/views/mus/platform_window_mus.cc

Issue 1954933002: Initial cut of ash/wm/common classes for mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk 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 | « mash/wm/window_layout.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « mash/wm/window_layout.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698