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

Unified Diff: services/ui/ws/window_manager_client_unittest.cc

Issue 2391853002: Makes mus not bring window to front on activation changes (Closed)
Patch Set: Created 4 years, 2 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
« services/ui/ws/display.cc ('K') | « services/ui/ws/display.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_manager_client_unittest.cc
diff --git a/services/ui/ws/window_manager_client_unittest.cc b/services/ui/ws/window_manager_client_unittest.cc
index 3dea21ef193e4741480ad489e340076ef0551d74..95d09157493ca0874bed478acf2cbe23bf00d02f 100644
--- a/services/ui/ws/window_manager_client_unittest.cc
+++ b/services/ui/ws/window_manager_client_unittest.cc
@@ -867,8 +867,7 @@ TEST_F(WindowServerTest, Activation) {
EXPECT_GT(ValidIndexOf(parent->children(), child3),
ValidIndexOf(parent->children(), child1));
- // Set focus on |child11|. This should activate |child1|, and raise it over
- // |child2|. But |child3| should still be above |child1| because of
+ // Set focus on |child11|. |child3| should still be above |child1| because of
// transiency.
child11->SetFocus();
ASSERT_TRUE(WaitForWindowToHaveFocus(child11));
@@ -878,8 +877,6 @@ TEST_F(WindowServerTest, Activation) {
server_id(window_manager()->GetFocusedWindow()));
EXPECT_EQ(server_id(child11), server_id(embedded1->GetFocusedWindow()));
EXPECT_EQ(nullptr, embedded2->GetFocusedWindow());
- EXPECT_GT(ValidIndexOf(parent->children(), child1),
msw 2016/10/03 23:42:01 Should we EXPECT_LT (or invert the args to match t
sky 2016/10/03 23:53:29 I've changed these around to be more explicit. The
- ValidIndexOf(parent->children(), child2));
EXPECT_GT(ValidIndexOf(parent->children(), child3),
ValidIndexOf(parent->children(), child1));
@@ -918,13 +915,11 @@ TEST_F(WindowServerTest, ActivationNext) {
Window* child31 = NewVisibleWindow(GetFirstRoot(embedded3), embedded3);
WaitForTreeSizeToMatch(parent, 7);
- Window* expecteds[] = { child3, child2, child1, child3, nullptr };
Window* focused[] = { child31, child21, child11, child31, nullptr };
- for (size_t index = 0; expecteds[index]; ++index) {
+ for (size_t index = 0; focused[index]; ++index) {
window_manager_client()->ActivateNextWindow();
WaitForWindowToHaveFocus(focused[index]);
EXPECT_TRUE(focused[index]->HasFocus());
- EXPECT_EQ(parent->children().back(), expecteds[index]);
}
}
« services/ui/ws/display.cc ('K') | « services/ui/ws/display.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698