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

Unified Diff: components/exo/shell_surface_unittest.cc

Issue 2109303003: third_party: Update to version 8 of remote_shell_protocol (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « components/exo/shell_surface.cc ('k') | components/exo/wayland/server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/shell_surface_unittest.cc
diff --git a/components/exo/shell_surface_unittest.cc b/components/exo/shell_surface_unittest.cc
index 8f63ff090cdbb9591cd558c6053193a76ee2559c..0e90f1264be2413d74ba839c9288f2fc7af258a6 100644
--- a/components/exo/shell_surface_unittest.cc
+++ b/components/exo/shell_surface_unittest.cc
@@ -407,21 +407,23 @@ TEST_F(ShellSurfaceTest, ModalWindow) {
surface->Commit();
EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
- // Makeing the surface opaque shouldn't make it modal either.
+ // Making the surface opaque shouldn't make it modal either.
child->SetBlendMode(SkXfermode::kSrc_Mode);
child->Commit();
surface->Commit();
EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
- // Only surface with input regions should be modal.
+ // Setting input regions won't make it modal either.
surface->SetInputRegion(
SkRegion(gfx::RectToSkIRect(gfx::Rect(10, 10, 100, 100))));
surface->Commit();
+ EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
+
+ // Only SetSystemModal changes modality.
+ shell_surface->SetSystemModal(true);
EXPECT_TRUE(ash::WmShell::Get()->IsSystemModalWindowOpen());
- // Removing input resion should make it non system modal.
- surface->SetInputRegion(SkRegion());
- surface->Commit();
+ shell_surface->SetSystemModal(false);
EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
}
« no previous file with comments | « components/exo/shell_surface.cc ('k') | components/exo/wayland/server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698