Makes mus not bring window to front on activation changes

services/ui/ws/window_manager_client_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 843 matching lines @@
   WindowTreeClient* embedded1 = Embed(child1).client;
   ASSERT_NE(nullptr, embedded1);
   WindowTreeClient* embedded2 = Embed(child2).client;
   ASSERT_NE(nullptr, embedded2);
 
   Window* child11 = NewVisibleWindow(GetFirstRoot(embedded1), embedded1);
   Window* child21 = NewVisibleWindow(GetFirstRoot(embedded2), embedded2);
 
   WaitForTreeSizeToMatch(parent, 6);
 
-  // |child2| and |child3| are stacked about |child1|.
-  EXPECT_GT(ValidIndexOf(parent->children(), child2),
-            ValidIndexOf(parent->children(), child1));
-  EXPECT_GT(ValidIndexOf(parent->children(), child3),
-            ValidIndexOf(parent->children(), child1));
+  EXPECT_EQ(0, ValidIndexOf(parent->children(), child1));
+  // NOTE: |child3| is after |child1| as |child3| is a transient child of
+  // |child1|.
+  EXPECT_EQ(1, ValidIndexOf(parent->children(), child3));
+  EXPECT_EQ(2, ValidIndexOf(parent->children(), child2));
 
-  // Set focus on |child11|. This should activate |child1|, and raise it over
-  // |child2|. But |child3| should still be above |child1| because of
-  // transiency.
+  // Set focus on |child11|, order of windows should not change.
   child11->SetFocus();
   ASSERT_TRUE(WaitForWindowToHaveFocus(child11));
   ASSERT_TRUE(WaitForWindowToHaveFocus(
       GetChildWindowByServerId(window_manager(), server_id(child11))));
   EXPECT_EQ(server_id(child11),
             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),
-            ValidIndexOf(parent->children(), child2));
-  EXPECT_GT(ValidIndexOf(parent->children(), child3),
-            ValidIndexOf(parent->children(), child1));
+  EXPECT_EQ(0, ValidIndexOf(parent->children(), child1));
+  EXPECT_EQ(1, ValidIndexOf(parent->children(), child3));
+  EXPECT_EQ(2, ValidIndexOf(parent->children(), child2));
 
-  // Set focus on |child21|. This should activate |child2|, and raise it over
-  // |child1|.
+  // Set focus on |child21|. This should activate |child2|. Again, order should
+  // not change.
   child21->SetFocus();
   ASSERT_TRUE(WaitForWindowToHaveFocus(child21));
   ASSERT_TRUE(WaitForWindowToHaveFocus(
       GetChildWindowByServerId(window_manager(), server_id(child21))));
   EXPECT_EQ(server_id(child21),
             server_id(window_manager()->GetFocusedWindow()));
   EXPECT_EQ(server_id(child21), server_id(embedded2->GetFocusedWindow()));
   EXPECT_TRUE(WaitForNoWindowToHaveFocus(embedded1));
   EXPECT_EQ(nullptr, embedded1->GetFocusedWindow());
-  EXPECT_GT(ValidIndexOf(parent->children(), child2),
-            ValidIndexOf(parent->children(), child1));
-  EXPECT_GT(ValidIndexOf(parent->children(), child3),
-            ValidIndexOf(parent->children(), child1));
+  EXPECT_EQ(0, ValidIndexOf(parent->children(), child1));
+  EXPECT_EQ(1, ValidIndexOf(parent->children(), child3));
+  EXPECT_EQ(2, ValidIndexOf(parent->children(), child2));
 }
 
 TEST_F(WindowServerTest, ActivationNext) {
   Window* parent = GetFirstWMRoot();
   Window* child1 = NewVisibleWindow(parent, window_manager());
   Window* child2 = NewVisibleWindow(parent, window_manager());
   Window* child3 = NewVisibleWindow(parent, window_manager());
 
   WindowTreeClient* embedded1 = Embed(child1).client;
   ASSERT_NE(nullptr, embedded1);
   WindowTreeClient* embedded2 = Embed(child2).client;
   ASSERT_NE(nullptr, embedded2);
   WindowTreeClient* embedded3 = Embed(child3).client;
   ASSERT_NE(nullptr, embedded3);
 
   Window* child11 = NewVisibleWindow(GetFirstRoot(embedded1), embedded1);
   Window* child21 = NewVisibleWindow(GetFirstRoot(embedded2), embedded2);
   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]);
   }
 }
 
 namespace {
 
 class DestroyedChangedObserver : public WindowObserver {
  public:
   DestroyedChangedObserver(Window* window, bool* got_destroy)
       : window_(window), got_destroy_(got_destroy) {
     window_->AddObserver(this);
@@ skipping 192 matching lines @@
   ASSERT_TRUE(window_in_wm);
 
   // Change the bounds in the wm, and make sure the child sees it.
   window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
   ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client));
   EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds());
 }
 
 }  // namespace ws
 }  // namespace ui